From 4d019c9672ece86a4e80f1c4e44227245ac95bee Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 23 Oct 2020 11:38:05 +0200 Subject: [PATCH] sync with upstream changes Signed-off-by: Felix Fietkau --- agg-rx.c | 4 ++-- eeprom.c | 2 +- mac80211.c | 5 ++--- mt7603/Makefile | 13 ++----------- mt7603/soc.c | 3 +-- mt7615/debugfs.c | 1 + mt76x0/Makefile | 1 + mt76x2/Makefile | 1 + mt7915/mcu.c | 4 ++-- 9 files changed, 13 insertions(+), 21 deletions(-) diff --git a/agg-rx.c b/agg-rx.c index f40518a9..df25c00d 100644 --- a/agg-rx.c +++ b/agg-rx.c @@ -290,8 +290,8 @@ void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno) { struct mt76_rx_tid *tid = NULL; - rcu_swap_protected(wcid->aggr[tidno], tid, - lockdep_is_held(&dev->mutex)); + tid = rcu_replace_pointer(wcid->aggr[tidno], tid, + lockdep_is_held(&dev->mutex)); if (tid) { mt76_rx_aggr_shutdown(dev, tid); kfree_rcu(tid, rcu_head); diff --git a/eeprom.c b/eeprom.c index 4f270f67..f1f97599 100644 --- a/eeprom.c +++ b/eeprom.c @@ -97,7 +97,7 @@ mt76_eeprom_override(struct mt76_dev *dev) if (np) mac = of_get_mac_address(np); if (!IS_ERR_OR_NULL(mac)) - memcpy(dev->macaddr, mac, ETH_ALEN); + ether_addr_copy(dev->macaddr, mac); #endif if (!is_valid_ether_addr(dev->macaddr)) { diff --git a/mac80211.c b/mac80211.c index 8bb107b8..77fccd0a 100644 --- a/mac80211.c +++ b/mac80211.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2016 Felix Fietkau */ -#include +#include #include #include "mt76.h" @@ -454,7 +454,6 @@ EXPORT_SYMBOL_GPL(mt76_alloc_device); int mt76_register_device(struct mt76_dev *dev, bool vht, struct ieee80211_rate *rates, int n_rates) { - struct sched_param sparam = {.sched_priority = 1}; struct ieee80211_hw *hw = dev->hw; struct mt76_phy *phy = &dev->phy; int ret; @@ -489,7 +488,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, return ret; WARN_ON(mt76_worker_setup(hw, &dev->tx_worker, NULL, "tx")); - sched_setscheduler(dev->tx_worker.task, SCHED_FIFO, &sparam); + sched_set_fifo_low(dev->tx_worker.task); return 0; } diff --git a/mt7603/Makefile b/mt7603/Makefile index 29f896a5..687f64fd 100644 --- a/mt7603/Makefile +++ b/mt7603/Makefile @@ -1,15 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only EXTRA_CFLAGS += -Werror -DCONFIG_MT76_LEDS - -CHECK_CC_ENUM_FLAGS = $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -CHECK_CC_ENUM_FLAGS += -DKBUILD_MODNAME='"mt7603e"' -check-cc-enum = $(call try-run, echo "int v = $(1);" | $(CC) -Werror $(CHECK_CC_ENUM_FLAGS) $(2) -c -x c - -o "$$TMP",y,n) - -# backwards compatibility hack -ifeq ($(call check-cc-enum,IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN,-include net/mac80211.h),n) - EXTRA_CFLAGS += -DIEEE80211_HW_TX_STATUS_NO_AMPDU_LEN=IEEE80211_HW_REPORTS_TX_ACK_STATUS -endif - -obj-m := mt7603e.o +obj-m += mt7603e.o mt7603e-y := \ pci.o soc.o main.o init.o mcu.o \ diff --git a/mt7603/soc.c b/mt7603/soc.c index 82c80e0a..ba927033 100644 --- a/mt7603/soc.c +++ b/mt7603/soc.c @@ -9,7 +9,6 @@ static int mt76_wmac_probe(struct platform_device *pdev) { - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct mt7603_dev *dev; void __iomem *mem_base; struct mt76_dev *mdev; @@ -20,7 +19,7 @@ mt76_wmac_probe(struct platform_device *pdev) if (irq < 0) return irq; - mem_base = devm_ioremap_resource(&pdev->dev, res); + mem_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(mem_base)) return PTR_ERR(mem_base); diff --git a/mt7615/debugfs.c b/mt7615/debugfs.c index 5f6ef389..a35ff054 100644 --- a/mt7615/debugfs.c +++ b/mt7615/debugfs.c @@ -464,6 +464,7 @@ static const struct file_operations fops_ext_mac_addr = { .llseek = generic_file_llseek, .read = mt7615_ext_mac_addr_read, .write = mt7615_ext_mac_addr_write, + .owner = THIS_MODULE, }; static int diff --git a/mt76x0/Makefile b/mt76x0/Makefile index aa22ba95..8dcfb4cb 100644 --- a/mt76x0/Makefile +++ b/mt76x0/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MT76x0U) += mt76x0u.o obj-$(CONFIG_MT76x0E) += mt76x0e.o obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o diff --git a/mt76x2/Makefile b/mt76x2/Makefile index 048187d0..caf08953 100644 --- a/mt76x2/Makefile +++ b/mt76x2/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o obj-$(CONFIG_MT76x2E) += mt76x2e.o obj-$(CONFIG_MT76x2U) += mt76x2u.o diff --git a/mt7915/mcu.c b/mt7915/mcu.c index b7b5c94c..6ec4f9d9 100644 --- a/mt7915/mcu.c +++ b/mt7915/mcu.c @@ -1648,7 +1648,7 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_VHT, sizeof(*vht), wtbl_tlv, sta_wtbl); vht = (struct wtbl_vht *)tlv; - vht->ldpc = !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC), + vht->ldpc = !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC); vht->vht = true; af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, @@ -2895,7 +2895,7 @@ int mt7915_mcu_init(struct mt7915_dev *dev) }; int ret; - dev->mt76.mcu_ops = &mt7915_mcu_ops, + dev->mt76.mcu_ops = &mt7915_mcu_ops; ret = mt7915_driver_own(dev); if (ret)