| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216 |
- --- a/mt76.h
- +++ b/mt76.h
- @@ -14,6 +14,7 @@
- #include <linux/usb.h>
- #include <linux/average.h>
- #include <linux/soc/mediatek/mtk_wed.h>
- +#include <net/netlink.h>
- #include <net/mac80211.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(6,6,0)
- #include <net/page_pool.h>
- @@ -1475,6 +1476,7 @@ static inline void mt76_testmode_reset(s
- #endif
- }
-
- +extern const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS];
-
- /* internal */
- static inline struct ieee80211_hw *
- --- a/mt7603/main.c
- +++ b/mt7603/main.c
- @@ -23,7 +23,7 @@ mt7603_start(struct ieee80211_hw *hw)
- }
-
- static void
- -mt7603_stop(struct ieee80211_hw *hw)
- +mt7603_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt7603_dev *dev = hw->priv;
-
- --- a/mt7615/main.c
- +++ b/mt7615/main.c
- @@ -91,7 +91,7 @@ out:
- return ret;
- }
-
- -static void mt7615_stop(struct ieee80211_hw *hw)
- +static void mt7615_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt7615_dev *dev = mt7615_hw_dev(hw);
- struct mt7615_phy *phy = mt7615_hw_phy(hw);
- --- a/mt7615/usb.c
- +++ b/mt7615/usb.c
- @@ -79,7 +79,7 @@ static void mt7663u_copy(struct mt76_dev
- mutex_unlock(&usb->usb_ctrl_mtx);
- }
-
- -static void mt7663u_stop(struct ieee80211_hw *hw)
- +static void mt7663u_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt7615_phy *phy = mt7615_hw_phy(hw);
- struct mt7615_dev *dev = hw->priv;
- --- a/mt76x0/pci.c
- +++ b/mt76x0/pci.c
- @@ -44,7 +44,7 @@ static void mt76x0e_stop_hw(struct mt76x
- mt76_clear(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_RX_DMA_EN);
- }
-
- -static void mt76x0e_stop(struct ieee80211_hw *hw)
- +static void mt76x0e_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt76x02_dev *dev = hw->priv;
-
- --- a/mt76x0/usb.c
- +++ b/mt76x0/usb.c
- @@ -77,7 +77,7 @@ static void mt76x0u_cleanup(struct mt76x
- mt76u_queues_deinit(&dev->mt76);
- }
-
- -static void mt76x0u_stop(struct ieee80211_hw *hw)
- +static void mt76x0u_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt76x02_dev *dev = hw->priv;
-
- --- a/mt76x2/pci_main.c
- +++ b/mt76x2/pci_main.c
- @@ -24,7 +24,7 @@ mt76x2_start(struct ieee80211_hw *hw)
- }
-
- static void
- -mt76x2_stop(struct ieee80211_hw *hw)
- +mt76x2_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt76x02_dev *dev = hw->priv;
-
- --- a/mt76x2/usb_main.c
- +++ b/mt76x2/usb_main.c
- @@ -22,7 +22,7 @@ static int mt76x2u_start(struct ieee8021
- return 0;
- }
-
- -static void mt76x2u_stop(struct ieee80211_hw *hw)
- +static void mt76x2u_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt76x02_dev *dev = hw->priv;
-
- --- a/mt7915/main.c
- +++ b/mt7915/main.c
- @@ -108,7 +108,7 @@ static int mt7915_start(struct ieee80211
- return ret;
- }
-
- -static void mt7915_stop(struct ieee80211_hw *hw)
- +static void mt7915_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt7915_dev *dev = mt7915_hw_dev(hw);
- struct mt7915_phy *phy = mt7915_hw_phy(hw);
- --- a/mt7915/mcu.c
- +++ b/mt7915/mcu.c
- @@ -335,7 +335,7 @@ mt7915_mcu_cca_finish(void *priv, u8 *ma
- if (!vif->bss_conf.color_change_active || vif->type == NL80211_IFTYPE_STATION)
- return;
-
- - ieee80211_color_change_finish(vif);
- + ieee80211_color_change_finish(vif, 0);
- }
-
- static void
- --- a/mt7921/main.c
- +++ b/mt7921/main.c
- @@ -268,7 +268,7 @@ static int mt7921_start(struct ieee80211
- return err;
- }
-
- -static void mt7921_stop(struct ieee80211_hw *hw)
- +static void mt7921_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt792x_dev *dev = mt792x_hw_dev(hw);
- int err = 0;
- @@ -281,7 +281,7 @@ static void mt7921_stop(struct ieee80211
- return;
- }
-
- - mt792x_stop(hw);
- + mt792x_stop(hw, false);
- }
-
- static int
- --- a/mt792x.h
- +++ b/mt792x.h
- @@ -337,7 +337,7 @@ static inline bool mt792x_dma_need_reini
- #define mt792x_mutex_release(dev) \
- mt76_connac_mutex_release(&(dev)->mt76, &(dev)->pm)
-
- -void mt792x_stop(struct ieee80211_hw *hw);
- +void mt792x_stop(struct ieee80211_hw *hw, bool suspend);
- void mt792x_pm_wake_work(struct work_struct *work);
- void mt792x_pm_power_save_work(struct work_struct *work);
- void mt792x_reset(struct mt76_dev *mdev);
- @@ -457,7 +457,7 @@ void mt792xu_wr(struct mt76_dev *dev, u3
- u32 mt792xu_rmw(struct mt76_dev *dev, u32 addr, u32 mask, u32 val);
- void mt792xu_copy(struct mt76_dev *dev, u32 offset, const void *data, int len);
- void mt792xu_disconnect(struct usb_interface *usb_intf);
- -void mt792xu_stop(struct ieee80211_hw *hw);
- +void mt792xu_stop(struct ieee80211_hw *hw, bool suspend);
-
- static inline void
- mt792x_skb_add_usb_sdio_hdr(struct mt792x_dev *dev, struct sk_buff *skb,
- --- a/mt792x_core.c
- +++ b/mt792x_core.c
- @@ -113,7 +113,7 @@ void mt792x_tx(struct ieee80211_hw *hw,
- }
- EXPORT_SYMBOL_GPL(mt792x_tx);
-
- -void mt792x_stop(struct ieee80211_hw *hw)
- +void mt792x_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt792x_dev *dev = mt792x_hw_dev(hw);
- struct mt792x_phy *phy = mt792x_hw_phy(hw);
- --- a/mt792x_usb.c
- +++ b/mt792x_usb.c
- @@ -285,12 +285,12 @@ int mt792xu_init_reset(struct mt792x_dev
- }
- EXPORT_SYMBOL_GPL(mt792xu_init_reset);
-
- -void mt792xu_stop(struct ieee80211_hw *hw)
- +void mt792xu_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt792x_dev *dev = mt792x_hw_dev(hw);
-
- mt76u_stop_tx(&dev->mt76);
- - mt792x_stop(hw);
- + mt792x_stop(hw, false);
- }
- EXPORT_SYMBOL_GPL(mt792xu_stop);
-
- --- a/mt7996/main.c
- +++ b/mt7996/main.c
- @@ -93,7 +93,7 @@ static int mt7996_start(struct ieee80211
- return ret;
- }
-
- -static void mt7996_stop(struct ieee80211_hw *hw)
- +static void mt7996_stop(struct ieee80211_hw *hw, bool suspend)
- {
- struct mt7996_dev *dev = mt7996_hw_dev(hw);
- struct mt7996_phy *phy = mt7996_hw_phy(hw);
- --- a/mt7996/mcu.c
- +++ b/mt7996/mcu.c
- @@ -421,7 +421,7 @@ mt7996_mcu_cca_finish(void *priv, u8 *ma
- if (!vif->bss_conf.color_change_active || vif->type == NL80211_IFTYPE_STATION)
- return;
-
- - ieee80211_color_change_finish(vif);
- + ieee80211_color_change_finish(vif, 0);
- }
-
- static void
- --- a/testmode.h
- +++ b/testmode.h
- @@ -193,6 +193,4 @@ enum mt76_testmode_tx_mode {
- MT76_TM_TX_MODE_MAX = NUM_MT76_TM_TX_MODES - 1,
- };
-
- -extern const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS];
- -
- #endif
|