---- a/drivers/net/wireless/ath/ath10k/mac.c
-+++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(st
- ch->allow_vht = true;
-
- ch->allow_ibss =
-- !(channel->flags & IEEE80211_CHAN_NO_IBSS);
-+ !(channel->flags & IEEE80211_CHAN_NO_IR);
-
- ch->ht40plus =
- !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
-
-- passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
-+ passive = channel->flags & IEEE80211_CHAN_NO_IR;
- ch->passive = passive;
-
- ch->freq = channel->center_freq;
---- a/drivers/net/wireless/ath/ath9k/Kconfig
-+++ b/drivers/net/wireless/ath/ath9k/Kconfig
-@@ -90,7 +90,7 @@ config ATH9K_DFS_CERTIFIED
-
- config ATH9K_TX99
- bool "Atheros ath9k TX99 testing support"
-- depends on CFG80211_CERTIFICATION_ONUS
-+ depends on ATH9K_DEBUGFS && CFG80211_CERTIFICATION_ONUS
- default n
- ---help---
- Say N. This should only be enabled on systems undergoing
-@@ -108,6 +108,14 @@ config ATH9K_TX99
- be evaluated to meet the RF exposure limits set forth in the
- governmental SAR regulations.
-
-+config ATH9K_WOW
-+ bool "Wake on Wireless LAN support (EXPERIMENTAL)"
-+ depends on ATH9K && PM
-+ default n
-+ ---help---
-+ This option enables Wake on Wireless LAN support for certain cards.
-+ Currently, AR9462 is supported.
-+
- config ATH9K_LEGACY_RATE_CONTROL
- bool "Atheros ath9k rate control"
- depends on ATH9K
---- a/drivers/net/wireless/ath/ath9k/Makefile
-+++ b/drivers/net/wireless/ath/ath9k/Makefile
-@@ -13,9 +13,9 @@ ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
- ath9k-$(CPTCFG_ATH9K_AHB) += ahb.o
- ath9k-$(CPTCFG_ATH9K_DEBUGFS) += debug.o
- ath9k-$(CPTCFG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
--ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += \
-- dfs.o
--ath9k-$(CONFIG_PM_SLEEP) += wow.o
-+ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += dfs.o
-+ath9k-$(CPTCFG_ATH9K_TX99) += tx99.o
-+ath9k-$(CPTCFG_ATH9K_WOW) += wow.o
-
- obj-$(CPTCFG_ATH9K) += ath9k.o
-
-@@ -41,6 +41,8 @@ ath9k_hw-y:= \
- ar9003_eeprom.o \
- ar9003_paprd.o
-
-+ath9k_hw-$(CPTCFG_ATH9K_WOW) += ar9003_wow.o
-+
- ath9k_hw-$(CPTCFG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \
- ar9003_mci.o
- obj-$(CPTCFG_ATH9K_HW) += ath9k_hw.o
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -581,6 +581,13 @@ static void ar9003_tx_gain_table_mode6(s
- ar9580_1p0_type6_tx_gain_table);
- }
-
-+static void ar9003_tx_gain_table_mode7(struct ath_hw *ah)
-+{
-+ if (AR_SREV_9340(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9340_cus227_tx_gain_table_1p0);
-+}
-+
- typedef void (*ath_txgain_tab)(struct ath_hw *ah);
-
- static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
-@@ -593,6 +600,7 @@ static void ar9003_tx_gain_table_apply(s
- ar9003_tx_gain_table_mode4,
- ar9003_tx_gain_table_mode5,
- ar9003_tx_gain_table_mode6,
-+ ar9003_tx_gain_table_mode7,
- };
- int idx = ar9003_hw_get_tx_gain_idx(ah);
-
-@@ -750,6 +758,9 @@ static void ar9003_hw_init_mode_gain_reg
- static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
- bool power_off)
- {
-+ unsigned int i;
-+ struct ar5416IniArray *array;
-+
- /*
- * Increase L1 Entry Latency. Some WB222 boards don't have
- * this change in eeprom/OTP.
-@@ -775,18 +786,13 @@ static void ar9003_hw_configpcipowersave
- * Configire PCIE after Ini init. SERDES values now come from ini file
- * This enables PCIe low power mode.
- */
-- if (ah->config.pcieSerDesWrite) {
-- unsigned int i;
-- struct ar5416IniArray *array;
--
-- array = power_off ? &ah->iniPcieSerdes :
-- &ah->iniPcieSerdesLowPower;
--
-- for (i = 0; i < array->ia_rows; i++) {
-- REG_WRITE(ah,
-- INI_RA(array, i, 0),
-- INI_RA(array, i, 1));
-- }
-+ array = power_off ? &ah->iniPcieSerdes :
-+ &ah->iniPcieSerdesLowPower;
-+
-+ for (i = 0; i < array->ia_rows; i++) {
-+ REG_WRITE(ah,
-+ INI_RA(array, i, 0),
-+ INI_RA(array, i, 1));
- }
- }
-
---- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-@@ -1447,4 +1447,106 @@ static const u32 ar9340_1p0_soc_preamble
- {0x00007038, 0x000004c2},
- };
-
-+static const u32 ar9340_cus227_tx_gain_table_1p0[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+ {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+ {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
-+ {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
-+ {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-+ {0x0000a520, 0x2c022220, 0x2c022220, 0x1b000603, 0x1b000603},
-+ {0x0000a524, 0x30022222, 0x30022222, 0x1f000a02, 0x1f000a02},
-+ {0x0000a528, 0x35022225, 0x35022225, 0x23000a04, 0x23000a04},
-+ {0x0000a52c, 0x3b02222a, 0x3b02222a, 0x26000a20, 0x26000a20},
-+ {0x0000a530, 0x3f02222c, 0x3f02222c, 0x2a000e20, 0x2a000e20},
-+ {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
-+ {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
-+ {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
-+ {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
-+ {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
-+ {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
-+ {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
-+ {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
-+ {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
-+ {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
-+ {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
-+ {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
-+ {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
-+ {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+ {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+ {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+ {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+ {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+ {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
-+ {0x0000a598, 0x21820220, 0x21820220, 0x15800402, 0x15800402},
-+ {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
-+ {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
-+ {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
-+ {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
-+ {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
-+ {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
-+ {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
-+ {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
-+ {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
-+ {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
-+ {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b801861, 0x3b801861},
-+ {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e801a81, 0x3e801a81},
-+ {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42801a83, 0x42801a83},
-+ {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x44801c84, 0x44801c84},
-+ {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x48801ce3, 0x48801ce3},
-+ {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c801ce5, 0x4c801ce5},
-+ {0x0000a5dc, 0x7086308c, 0x7086308c, 0x50801ce9, 0x50801ce9},
-+ {0x0000a5e0, 0x738a308a, 0x738a308a, 0x54801ceb, 0x54801ceb},
-+ {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-+ {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
-+ {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
-+ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-+ {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
-+ {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
-+ {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+ {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+ {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+ {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-+ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-+ {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
-+ {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
-+ {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
-+ {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-+ {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
-+ {0x0000a3a4, 0x00000011, 0x00000011, 0x00000011, 0x00000011},
-+ {0x0000a3a8, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c},
-+ {0x0000a3ac, 0x30303030, 0x30303030, 0x30303030, 0x30303030},
-+};
-+
- #endif /* INITVALS_9340_H */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc)
- int ath_update_survey_stats(struct ath_softc *sc);
- void ath_update_survey_nf(struct ath_softc *sc, int channel);
- void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
-+void ath_ps_full_sleep(unsigned long data);
-
- /**********/
- /* BTCOEX */
-@@ -570,6 +571,34 @@ static inline void ath_fill_led_pin(stru
- }
- #endif
-
-+/************************/
-+/* Wake on Wireless LAN */
-+/************************/
-+
-+#ifdef CONFIG_ATH9K_WOW
-+void ath9k_init_wow(struct ieee80211_hw *hw);
-+int ath9k_suspend(struct ieee80211_hw *hw,
-+ struct cfg80211_wowlan *wowlan);
-+int ath9k_resume(struct ieee80211_hw *hw);
-+void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled);
-+#else
-+static inline void ath9k_init_wow(struct ieee80211_hw *hw)
-+{
-+}
-+static inline int ath9k_suspend(struct ieee80211_hw *hw,
-+ struct cfg80211_wowlan *wowlan)
-+{
-+ return 0;
-+}
-+static inline int ath9k_resume(struct ieee80211_hw *hw)
-+{
-+ return 0;
-+}
-+static inline void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
-+{
-+}
-+#endif /* CONFIG_ATH9K_WOW */
-+
- /*******************************/
- /* Antenna diversity/combining */
- /*******************************/
-@@ -723,6 +752,7 @@ struct ath_softc {
- struct work_struct hw_check_work;
- struct work_struct hw_reset_work;
- struct completion paprd_complete;
-+ wait_queue_head_t tx_wait;
-
- unsigned int hw_busy_count;
- unsigned long sc_flags;
-@@ -759,6 +789,7 @@ struct ath_softc {
- struct delayed_work tx_complete_work;
- struct delayed_work hw_pll_work;
- struct timer_list rx_poll_timer;
-+ struct timer_list sleep_timer;
-
- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
- struct ath_btcoex btcoex;
-@@ -783,7 +814,7 @@ struct ath_softc {
- bool tx99_state;
- s16 tx99_power;
-
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
- atomic_t wow_got_bmiss_intr;
- atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
- u32 wow_intr_before_sleep;
-@@ -946,10 +977,25 @@ struct fft_sample_ht20_40 {
- u8 data[SPECTRAL_HT20_40_NUM_BINS];
- } __packed;
-
--int ath9k_tx99_init(struct ath_softc *sc);
--void ath9k_tx99_deinit(struct ath_softc *sc);
-+/********/
-+/* TX99 */
-+/********/
-+
-+#ifdef CONFIG_ATH9K_TX99
-+void ath9k_tx99_init_debug(struct ath_softc *sc);
- int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
- struct ath_tx_control *txctl);
-+#else
-+static inline void ath9k_tx99_init_debug(struct ath_softc *sc)
-+{
-+}
-+static inline int ath9k_tx99_send(struct ath_softc *sc,
-+ struct sk_buff *skb,
-+ struct ath_tx_control *txctl)
-+{
-+ return 0;
-+}
-+#endif /* CONFIG_ATH9K_TX99 */
-
- void ath9k_tasklet(unsigned long data);
- int ath_cabq_update(struct ath_softc *);
-@@ -966,6 +1012,9 @@ extern bool is_ath9k_unloaded;
-
- u8 ath9k_parse_mpdudensity(u8 mpdudensity);
- irqreturn_t ath_isr(int irq, void *dev);
-+int ath_reset(struct ath_softc *sc);
-+void ath_cancel_work(struct ath_softc *sc);
-+void ath_restart_work(struct ath_softc *sc);
- int ath9k_init_device(u16 devid, struct ath_softc *sc,
- const struct ath_bus_ops *bus_ops);
- void ath9k_deinit_device(struct ath_softc *sc);
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1782,111 +1782,6 @@ void ath9k_deinit_debug(struct ath_softc
- }
- }
-
--static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
-- size_t count, loff_t *ppos)
--{
-- struct ath_softc *sc = file->private_data;
-- char buf[3];
-- unsigned int len;
--
-- len = sprintf(buf, "%d\n", sc->tx99_state);
-- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
--}
--
--static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
-- size_t count, loff_t *ppos)
--{
-- struct ath_softc *sc = file->private_data;
-- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- char buf[32];
-- bool start;
-- ssize_t len;
-- int r;
--
-- if (sc->nvifs > 1)
-- return -EOPNOTSUPP;
--
-- len = min(count, sizeof(buf) - 1);
-- if (copy_from_user(buf, user_buf, len))
-- return -EFAULT;
--
-- if (strtobool(buf, &start))
-- return -EINVAL;
--
-- if (start == sc->tx99_state) {
-- if (!start)
-- return count;
-- ath_dbg(common, XMIT, "Resetting TX99\n");
-- ath9k_tx99_deinit(sc);
-- }
--
-- if (!start) {
-- ath9k_tx99_deinit(sc);
-- return count;
-- }
--
-- r = ath9k_tx99_init(sc);
-- if (r)
-- return r;
--
-- return count;
--}
--
--static const struct file_operations fops_tx99 = {
-- .read = read_file_tx99,
-- .write = write_file_tx99,
-- .open = simple_open,
-- .owner = THIS_MODULE,
-- .llseek = default_llseek,
--};
--
--static ssize_t read_file_tx99_power(struct file *file,
-- char __user *user_buf,
-- size_t count, loff_t *ppos)
--{
-- struct ath_softc *sc = file->private_data;
-- char buf[32];
-- unsigned int len;
--
-- len = sprintf(buf, "%d (%d dBm)\n",
-- sc->tx99_power,
-- sc->tx99_power / 2);
--
-- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
--}
--
--static ssize_t write_file_tx99_power(struct file *file,
-- const char __user *user_buf,
-- size_t count, loff_t *ppos)
--{
-- struct ath_softc *sc = file->private_data;
-- int r;
-- u8 tx_power;
--
-- r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
-- if (r)
-- return r;
--
-- if (tx_power > MAX_RATE_POWER)
-- return -EINVAL;
--
-- sc->tx99_power = tx_power;
--
-- ath9k_ps_wakeup(sc);
-- ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
-- ath9k_ps_restore(sc);
--
-- return count;
--}
--
--static const struct file_operations fops_tx99_power = {
-- .read = read_file_tx99_power,
-- .write = write_file_tx99_power,
-- .open = simple_open,
-- .owner = THIS_MODULE,
-- .llseek = default_llseek,
--};
--
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -1903,6 +1798,7 @@ int ath9k_init_debug(struct ath_hw *ah)
- #endif
-
- ath9k_dfs_init_debug(sc);
-+ ath9k_tx99_init_debug(sc);
-
- debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_dma);
-@@ -1978,15 +1874,6 @@ int ath9k_init_debug(struct ath_hw *ah)
- debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_btcoex);
- #endif
-- if (config_enabled(CPTCFG_ATH9K_TX99) &&
-- AR_SREV_9300_20_OR_LATER(ah)) {
-- debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
-- sc->debug.debugfs_phy, sc,
-- &fops_tx99);
-- debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
-- sc->debug.debugfs_phy, sc,
-- &fops_tx99_power);
-- }
-
- return 0;
- }
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -454,7 +454,6 @@ static void ath9k_hw_init_config(struct
- }
-
- ah->config.rx_intr_mitigation = true;
-- ah->config.pcieSerDesWrite = true;
-
- /*
- * We need this for PCI devices only (Cardbus, PCI, miniPCI)
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -283,7 +283,6 @@ struct ath9k_ops_config {
- int additional_swba_backoff;
- int ack_6mb;
- u32 cwm_ignore_extcca;
-- bool pcieSerDesWrite;
- u8 pcie_clock_req;
- u32 pcie_waen;
- u8 analog_shiftreg;
-@@ -920,7 +919,7 @@ struct ath_hw {
- /* Enterprise mode cap */
- u32 ent_mode;
-
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
- u32 wow_event_mask;
- #endif
- bool is_clk_25mhz;
-@@ -1126,7 +1125,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw
- #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
-
-
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
- const char *ath9k_hw_wow_event_to_string(u32 wow_event);
- void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
- u8 *user_mask, int pattern_count,
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -683,6 +683,7 @@ static int ath9k_init_softc(u16 devid, s
- common = ath9k_hw_common(ah);
- sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
- sc->tx99_power = MAX_RATE_POWER + 1;
-+ init_waitqueue_head(&sc->tx_wait);
-
- if (!pdata) {
- ah->ah_flags |= AH_USE_EEPROM;
-@@ -730,6 +731,7 @@ static int ath9k_init_softc(u16 devid, s
- tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
- (unsigned long)sc);
-
-+ setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
- INIT_WORK(&sc->hw_reset_work, ath_reset_work);
- INIT_WORK(&sc->hw_check_work, ath_hw_check);
- INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-@@ -862,20 +864,11 @@ static const struct ieee80211_iface_comb
- .max_interfaces = 1,
- .num_different_channels = 1,
- .beacon_int_infra_match = true,
-- .radar_detect_widths = BIT(NL80211_CHAN_NO_HT) |
-- BIT(NL80211_CHAN_HT20),
-+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
-+ BIT(NL80211_CHAN_WIDTH_20),
- }
- };
-
--#ifdef CONFIG_PM
--static const struct wiphy_wowlan_support ath9k_wowlan_support = {
-- .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
-- .n_patterns = MAX_NUM_USER_PATTERN,
-- .pattern_min_len = 1,
-- .pattern_max_len = MAX_PATTERN_SIZE,
--};
--#endif
--
- void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
- {
- struct ath_hw *ah = sc->sc_ah;
-@@ -925,16 +918,6 @@ void ath9k_set_hw_capab(struct ath_softc
- hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
- hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
-
--#ifdef CONFIG_PM_SLEEP
-- if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
-- (sc->driver_data & ATH9K_PCI_WOW) &&
-- device_can_wakeup(sc->dev))
-- hw->wiphy->wowlan = &ath9k_wowlan_support;
--
-- atomic_set(&sc->wow_sleep_proc_intr, -1);
-- atomic_set(&sc->wow_got_bmiss_intr, -1);
--#endif
--
- hw->queues = 4;
- hw->max_rates = 4;
- hw->channel_change_time = 5000;
-@@ -960,6 +943,7 @@ void ath9k_set_hw_capab(struct ath_softc
- hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
- &sc->sbands[IEEE80211_BAND_5GHZ];
-
-+ ath9k_init_wow(hw);
- ath9k_reload_chainmask_settings(sc);
-
- SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
-@@ -1058,6 +1042,7 @@ static void ath9k_deinit_softc(struct at
- if (ATH_TXQ_SETUP(sc, i))
- ath_tx_cleanupq(sc, &sc->tx.txq[i]);
-
-+ del_timer_sync(&sc->sleep_timer);
- ath9k_hw_deinit(sc->sc_ah);
- if (sc->dfs_detector != NULL)
- sc->dfs_detector->exit(sc->dfs_detector);
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -82,6 +82,22 @@ static bool ath9k_setpower(struct ath_so
- return ret;
- }
-
-+void ath_ps_full_sleep(unsigned long data)
-+{
-+ struct ath_softc *sc = (struct ath_softc *) data;
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ bool reset;
-+
-+ spin_lock(&common->cc_lock);
-+ ath_hw_cycle_counters_update(common);
-+ spin_unlock(&common->cc_lock);
-+
-+ ath9k_hw_setrxabort(sc->sc_ah, 1);
-+ ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
-+
-+ ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
-+}
-+
- void ath9k_ps_wakeup(struct ath_softc *sc)
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-@@ -92,6 +108,7 @@ void ath9k_ps_wakeup(struct ath_softc *s
- if (++sc->ps_usecount != 1)
- goto unlock;
-
-+ del_timer_sync(&sc->sleep_timer);
- power_mode = sc->sc_ah->power_mode;
- ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
-
-@@ -117,17 +134,17 @@ void ath9k_ps_restore(struct ath_softc *
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- enum ath9k_power_mode mode;
- unsigned long flags;
-- bool reset;
-
- spin_lock_irqsave(&sc->sc_pm_lock, flags);
- if (--sc->ps_usecount != 0)
- goto unlock;
-
- if (sc->ps_idle) {
-- ath9k_hw_setrxabort(sc->sc_ah, 1);
-- ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
-- mode = ATH9K_PM_FULL_SLEEP;
-- } else if (sc->ps_enabled &&
-+ mod_timer(&sc->sleep_timer, jiffies + HZ / 10);
-+ goto unlock;
-+ }
-+
-+ if (sc->ps_enabled &&
- !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
- PS_WAIT_FOR_CAB |
- PS_WAIT_FOR_PSPOLL_DATA |
-@@ -163,13 +180,13 @@ static void __ath_cancel_work(struct ath
- #endif
- }
-
--static void ath_cancel_work(struct ath_softc *sc)
-+void ath_cancel_work(struct ath_softc *sc)
- {
- __ath_cancel_work(sc);
- cancel_work_sync(&sc->hw_reset_work);
- }
-
--static void ath_restart_work(struct ath_softc *sc)
-+void ath_restart_work(struct ath_softc *sc)
- {
- ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-
-@@ -487,6 +504,8 @@ void ath9k_tasklet(unsigned long data)
- ath_tx_edma_tasklet(sc);
- else
- ath_tx_tasklet(sc);
-+
-+ wake_up(&sc->tx_wait);
- }
-
- ath9k_btcoex_handle_interrupt(sc, status);
-@@ -579,7 +598,8 @@ irqreturn_t ath_isr(int irq, void *dev)
-
- goto chip_reset;
- }
--#ifdef CONFIG_PM_SLEEP
-+
-+#ifdef CONFIG_ATH9K_WOW
- if (status & ATH9K_INT_BMISS) {
- if (atomic_read(&sc->wow_sleep_proc_intr) == 0) {
- ath_dbg(common, ANY, "during WoW we got a BMISS\n");
-@@ -588,6 +608,8 @@ irqreturn_t ath_isr(int irq, void *dev)
- }
- }
- #endif
-+
-+
- if (status & ATH9K_INT_SWBA)
- tasklet_schedule(&sc->bcon_tasklet);
-
-@@ -627,7 +649,7 @@ chip_reset:
- #undef SCHED_INTR
- }
-
--static int ath_reset(struct ath_softc *sc)
-+int ath_reset(struct ath_softc *sc)
- {
- int r;
-
-@@ -1817,13 +1839,31 @@ static void ath9k_set_coverage_class(str
- mutex_unlock(&sc->mutex);
- }
-
-+static bool ath9k_has_tx_pending(struct ath_softc *sc)
-+{
-+ int i, npend;
-+
-+ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-+ if (!ATH_TXQ_SETUP(sc, i))
-+ continue;
-+
-+ if (!sc->tx.txq[i].axq_depth)
-+ continue;
-+
-+ npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
-+ if (npend)
-+ break;
-+ }
-+
-+ return !!npend;
-+}
-+
- static void ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
+commit 6df35206bc6c1c6aad1d8077df5786b4a7f77873
+Author: Felix Fietkau <nbd@openwrt.org>
+Date: Fri May 23 19:58:14 2014 +0200
+
+ mac80211: reduce packet loss notifications under load
+
+ During strong signal fluctuations under high throughput, few consecutive
+ failed A-MPDU transmissions can easily trigger packet loss notification,
+ and thus (in AP mode) client disconnection.
+
+ Reduce the number of false positives by checking the A-MPDU status flag
+ and treating a failed A-MPDU as a single packet.
+
+ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+commit 7b7843a36fbcc568834404c7430ff895d8502131
+Author: Felix Fietkau <nbd@openwrt.org>
+Date: Fri May 23 19:26:32 2014 +0200
+
+ mac80211: fix a memory leak on sta rate selection table
+
+ Cc: stable@vger.kernel.org
+ Reported-by: Christophe Prévotaux <cprevotaux@nltinc.com>
+ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+commit 96892d6aa0a153423070addf3070bc79578b3897
+Author: Felix Fietkau <nbd@openwrt.org>
+Date: Mon May 19 21:20:49 2014 +0200
+
+ ath9k: avoid passing buffers to the hardware during flush
+
+ The commit "ath9k: fix possible hang on flush" changed the receive code
+ to always link rx descriptors of processed frames, even when flushing.
+ In some cases, this leads to flushed rx buffers being passed to the
+ hardware while rx is already stopped.
+
+ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -34,7 +34,8 @@ static inline bool ath9k_check_auto_slee
+ * buffer (or rx fifo). This can incorrectly acknowledge packets
+ * to a sender if last desc is self-linked.
+ */
+-static void ath_rx_buf_link(struct ath_softc *sc, struct ath_rxbuf *bf)
++static void ath_rx_buf_link(struct ath_softc *sc, struct ath_rxbuf *bf,
++ bool flush)
{
- struct ath_softc *sc = hw->priv;
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
-- int timeout = 200; /* ms */
-- int i, j;
-+ int timeout = HZ / 5; /* 200 ms */
- bool drain_txq;
-
- mutex_lock(&sc->mutex);
-@@ -1841,25 +1881,9 @@ static void ath9k_flush(struct ieee80211
- return;
- }
-
-- for (j = 0; j < timeout; j++) {
-- bool npend = false;
--
-- if (j)
-- usleep_range(1000, 2000);
--
-- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-- if (!ATH_TXQ_SETUP(sc, i))
-- continue;
--
-- npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
--
-- if (npend)
-- break;
-- }
--
-- if (!npend)
-- break;
-- }
-+ if (wait_event_timeout(sc->tx_wait, !ath9k_has_tx_pending(sc),
-+ timeout) > 0)
-+ drop = false;
-
- if (drop) {
- ath9k_ps_wakeup(sc);
-@@ -2021,333 +2045,6 @@ static int ath9k_get_antenna(struct ieee
- return 0;
- }
-
--#ifdef CONFIG_PM_SLEEP
--
--static void ath9k_wow_map_triggers(struct ath_softc *sc,
-- struct cfg80211_wowlan *wowlan,
-- u32 *wow_triggers)
--{
-- if (wowlan->disconnect)
-- *wow_triggers |= AH_WOW_LINK_CHANGE |
-- AH_WOW_BEACON_MISS;
-- if (wowlan->magic_pkt)
-- *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
--
-- if (wowlan->n_patterns)
-- *wow_triggers |= AH_WOW_USER_PATTERN_EN;
--
-- sc->wow_enabled = *wow_triggers;
--
--}
--
--static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
--{
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- int pattern_count = 0;
-- int i, byte_cnt;
-- u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
-- u8 dis_deauth_mask[MAX_PATTERN_SIZE];
--
-- memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
-- memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
--
-- /*
-- * Create Dissassociate / Deauthenticate packet filter
-- *
-- * 2 bytes 2 byte 6 bytes 6 bytes 6 bytes
-- * +--------------+----------+---------+--------+--------+----
-- * + Frame Control+ Duration + DA + SA + BSSID +
-- * +--------------+----------+---------+--------+--------+----
-- *
-- * The above is the management frame format for disassociate/
-- * deauthenticate pattern, from this we need to match the first byte
-- * of 'Frame Control' and DA, SA, and BSSID fields
-- * (skipping 2nd byte of FC and Duration feild.
-- *
-- * Disassociate pattern
-- * --------------------
-- * Frame control = 00 00 1010
-- * DA, SA, BSSID = x:x:x:x:x:x
-- * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
-- * | x:x:x:x:x:x -- 22 bytes
-- *
-- * Deauthenticate pattern
-- * ----------------------
-- * Frame control = 00 00 1100
-- * DA, SA, BSSID = x:x:x:x:x:x
-- * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
-- * | x:x:x:x:x:x -- 22 bytes
-- */
--
-- /* Create Disassociate Pattern first */
--
-- byte_cnt = 0;
--
-- /* Fill out the mask with all FF's */
--
-- for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
-- dis_deauth_mask[i] = 0xff;
--
-- /* copy the first byte of frame control field */
-- dis_deauth_pattern[byte_cnt] = 0xa0;
-- byte_cnt++;
--
-- /* skip 2nd byte of frame control and Duration field */
-- byte_cnt += 3;
--
-- /*
-- * need not match the destination mac address, it can be a broadcast
-- * mac address or an unicast to this station
-- */
-- byte_cnt += 6;
--
-- /* copy the source mac address */
-- memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
--
-- byte_cnt += 6;
--
-- /* copy the bssid, its same as the source mac address */
--
-- memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
--
-- /* Create Disassociate pattern mask */
--
-- dis_deauth_mask[0] = 0xfe;
-- dis_deauth_mask[1] = 0x03;
-- dis_deauth_mask[2] = 0xc0;
--
-- ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
--
-- ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
-- pattern_count, byte_cnt);
--
-- pattern_count++;
-- /*
-- * for de-authenticate pattern, only the first byte of the frame
-- * control field gets changed from 0xA0 to 0xC0
-- */
-- dis_deauth_pattern[0] = 0xC0;
--
-- ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
-- pattern_count, byte_cnt);
--
--}
--
--static void ath9k_wow_add_pattern(struct ath_softc *sc,
-- struct cfg80211_wowlan *wowlan)
--{
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath9k_wow_pattern *wow_pattern = NULL;
-- struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
-- int mask_len;
-- s8 i = 0;
--
-- if (!wowlan->n_patterns)
-- return;
--
-- /*
-- * Add the new user configured patterns
-- */
-- for (i = 0; i < wowlan->n_patterns; i++) {
--
-- wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
--
-- if (!wow_pattern)
-- return;
--
-- /*
-- * TODO: convert the generic user space pattern to
-- * appropriate chip specific/802.11 pattern.
-- */
--
-- mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
-- memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
-- memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
-- memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
-- patterns[i].pattern_len);
-- memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
-- wow_pattern->pattern_len = patterns[i].pattern_len;
--
-- /*
-- * just need to take care of deauth and disssoc pattern,
-- * make sure we don't overwrite them.
-- */
--
-- ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
-- wow_pattern->mask_bytes,
-- i + 2,
-- wow_pattern->pattern_len);
-- kfree(wow_pattern);
--
-- }
--
--}
--
--static int ath9k_suspend(struct ieee80211_hw *hw,
-- struct cfg80211_wowlan *wowlan)
--{
-- struct ath_softc *sc = hw->priv;
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- u32 wow_triggers_enabled = 0;
-- int ret = 0;
--
-- mutex_lock(&sc->mutex);
--
-- ath_cancel_work(sc);
-- ath_stop_ani(sc);
-- del_timer_sync(&sc->rx_poll_timer);
--
-- if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
-- ath_dbg(common, ANY, "Device not present\n");
-- ret = -EINVAL;
-- goto fail_wow;
-- }
--
-- if (WARN_ON(!wowlan)) {
-- ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
-- ret = -EINVAL;
-- goto fail_wow;
-- }
--
-- if (!device_can_wakeup(sc->dev)) {
-- ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
-- ret = 1;
-- goto fail_wow;
-- }
--
-- /*
-- * none of the sta vifs are associated
-- * and we are not currently handling multivif
-- * cases, for instance we have to seperately
-- * configure 'keep alive frame' for each
-- * STA.
-- */
--
-- if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-- ath_dbg(common, WOW, "None of the STA vifs are associated\n");
-- ret = 1;
-- goto fail_wow;
-- }
--
-- if (sc->nvifs > 1) {
-- ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
-- ret = 1;
-- goto fail_wow;
-- }
--
-- ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
--
-- ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
-- wow_triggers_enabled);
--
-- ath9k_ps_wakeup(sc);
--
-- ath9k_stop_btcoex(sc);
--
-- /*
-- * Enable wake up on recieving disassoc/deauth
-- * frame by default.
-- */
-- ath9k_wow_add_disassoc_deauth_pattern(sc);
--
-- if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
-- ath9k_wow_add_pattern(sc, wowlan);
--
-- spin_lock_bh(&sc->sc_pcu_lock);
-- /*
-- * To avoid false wake, we enable beacon miss interrupt only
-- * when we go to sleep. We save the current interrupt mask
-- * so we can restore it after the system wakes up
-- */
-- sc->wow_intr_before_sleep = ah->imask;
-- ah->imask &= ~ATH9K_INT_GLOBAL;
-- ath9k_hw_disable_interrupts(ah);
-- ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
-- ath9k_hw_set_interrupts(ah);
-- ath9k_hw_enable_interrupts(ah);
--
-- spin_unlock_bh(&sc->sc_pcu_lock);
--
-- /*
-- * we can now sync irq and kill any running tasklets, since we already
-- * disabled interrupts and not holding a spin lock
-- */
-- synchronize_irq(sc->irq);
-- tasklet_kill(&sc->intr_tq);
--
-- ath9k_hw_wow_enable(ah, wow_triggers_enabled);
--
-- ath9k_ps_restore(sc);
-- ath_dbg(common, ANY, "WoW enabled in ath9k\n");
-- atomic_inc(&sc->wow_sleep_proc_intr);
--
--fail_wow:
-- mutex_unlock(&sc->mutex);
-- return ret;
--}
--
--static int ath9k_resume(struct ieee80211_hw *hw)
--{
-- struct ath_softc *sc = hw->priv;
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- u32 wow_status;
--
-- mutex_lock(&sc->mutex);
--
-- ath9k_ps_wakeup(sc);
--
-- spin_lock_bh(&sc->sc_pcu_lock);
--
-- ath9k_hw_disable_interrupts(ah);
-- ah->imask = sc->wow_intr_before_sleep;
-- ath9k_hw_set_interrupts(ah);
-- ath9k_hw_enable_interrupts(ah);
--
-- spin_unlock_bh(&sc->sc_pcu_lock);
--
-- wow_status = ath9k_hw_wow_wakeup(ah);
--
-- if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
-- /*
-- * some devices may not pick beacon miss
-- * as the reason they woke up so we add
-- * that here for that shortcoming.
-- */
-- wow_status |= AH_WOW_BEACON_MISS;
-- atomic_dec(&sc->wow_got_bmiss_intr);
-- ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
-- }
--
-- atomic_dec(&sc->wow_sleep_proc_intr);
--
-- if (wow_status) {
-- ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
-- ath9k_hw_wow_event_to_string(wow_status), wow_status);
-- }
--
-- ath_restart_work(sc);
-- ath9k_start_btcoex(sc);
--
-- ath9k_ps_restore(sc);
-- mutex_unlock(&sc->mutex);
--
-- return 0;
--}
--
--static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
--{
-- struct ath_softc *sc = hw->priv;
--
-- mutex_lock(&sc->mutex);
-- device_init_wakeup(sc->dev, 1);
-- device_set_wakeup_enable(sc->dev, enabled);
-- mutex_unlock(&sc->mutex);
--}
--
--#endif
- static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
- {
- struct ath_softc *sc = hw->priv;
-@@ -2373,134 +2070,6 @@ static void ath9k_channel_switch_beacon(
- sc->csa_vif = vif;
- }
+@@ -59,18 +60,19 @@ static void ath_rx_buf_link(struct ath_s
+ common->rx_bufsize,
+ 0);
--static void ath9k_tx99_stop(struct ath_softc *sc)
--{
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
--
-- ath_drain_all_txq(sc);
-- ath_startrecv(sc);
--
-- ath9k_hw_set_interrupts(ah);
-- ath9k_hw_enable_interrupts(ah);
--
-- ieee80211_wake_queues(sc->hw);
--
-- kfree_skb(sc->tx99_skb);
-- sc->tx99_skb = NULL;
-- sc->tx99_state = false;
--
-- ath9k_hw_tx99_stop(sc->sc_ah);
-- ath_dbg(common, XMIT, "TX99 stopped\n");
--}
--
--static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
--{
-- static u8 PN9Data[] = {0xff, 0x87, 0xb8, 0x59, 0xb7, 0xa1, 0xcc, 0x24,
-- 0x57, 0x5e, 0x4b, 0x9c, 0x0e, 0xe9, 0xea, 0x50,
-- 0x2a, 0xbe, 0xb4, 0x1b, 0xb6, 0xb0, 0x5d, 0xf1,
-- 0xe6, 0x9a, 0xe3, 0x45, 0xfd, 0x2c, 0x53, 0x18,
-- 0x0c, 0xca, 0xc9, 0xfb, 0x49, 0x37, 0xe5, 0xa8,
-- 0x51, 0x3b, 0x2f, 0x61, 0xaa, 0x72, 0x18, 0x84,
-- 0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
-- 0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
-- u32 len = 1200;
-- struct ieee80211_hw *hw = sc->hw;
-- struct ieee80211_hdr *hdr;
-- struct ieee80211_tx_info *tx_info;
-- struct sk_buff *skb;
--
-- skb = alloc_skb(len, GFP_KERNEL);
-- if (!skb)
-- return NULL;
--
-- skb_put(skb, len);
--
-- memset(skb->data, 0, len);
--
-- hdr = (struct ieee80211_hdr *)skb->data;
-- hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA);
-- hdr->duration_id = 0;
--
-- memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
-- memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
-- memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
--
-- hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
--
-- tx_info = IEEE80211_SKB_CB(skb);
-- memset(tx_info, 0, sizeof(*tx_info));
-- tx_info->band = hw->conf.chandef.chan->band;
-- tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
-- tx_info->control.vif = sc->tx99_vif;
--
-- memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));
--
-- return skb;
--}
--
--void ath9k_tx99_deinit(struct ath_softc *sc)
--{
-- ath_reset(sc);
--
-- ath9k_ps_wakeup(sc);
-- ath9k_tx99_stop(sc);
-- ath9k_ps_restore(sc);
--}
--
--int ath9k_tx99_init(struct ath_softc *sc)
--{
-- struct ieee80211_hw *hw = sc->hw;
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- struct ath_tx_control txctl;
-- int r;
--
-- if (sc->sc_flags & SC_OP_INVALID) {
-- ath_err(common,
-- "driver is in invalid state unable to use TX99");
-- return -EINVAL;
-- }
--
-- sc->tx99_skb = ath9k_build_tx99_skb(sc);
-- if (!sc->tx99_skb)
-- return -ENOMEM;
--
-- memset(&txctl, 0, sizeof(txctl));
-- txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
--
-- ath_reset(sc);
--
-- ath9k_ps_wakeup(sc);
--
-- ath9k_hw_disable_interrupts(ah);
-- atomic_set(&ah->intr_ref_cnt, -1);
-- ath_drain_all_txq(sc);
-- ath_stoprecv(sc);
--
-- sc->tx99_state = true;
--
-- ieee80211_stop_queues(hw);
--
-- if (sc->tx99_power == MAX_RATE_POWER + 1)
-- sc->tx99_power = MAX_RATE_POWER;
--
-- ath9k_hw_tx99_set_txpower(ah, sc->tx99_power);
-- r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
-- if (r) {
-- ath_dbg(common, XMIT, "Failed to xmit TX99 skb\n");
-- return r;
-- }
--
-- ath_dbg(common, XMIT, "TX99 xmit started using %d ( %ddBm)\n",
-- sc->tx99_power,
-- sc->tx99_power / 2);
--
-- /* We leave the harware awake as it will be chugging on */
--
-- return 0;
--}
--
- struct ieee80211_ops ath9k_ops = {
- .tx = ath9k_tx,
- .start = ath9k_start,
-@@ -2531,7 +2100,7 @@ struct ieee80211_ops ath9k_ops = {
- .set_antenna = ath9k_set_antenna,
- .get_antenna = ath9k_get_antenna,
+- if (sc->rx.rxlink == NULL)
+- ath9k_hw_putrxbuf(ah, bf->bf_daddr);
+- else
++ if (sc->rx.rxlink)
+ *sc->rx.rxlink = bf->bf_daddr;
++ else if (!flush)
++ ath9k_hw_putrxbuf(ah, bf->bf_daddr);
+
+ sc->rx.rxlink = &ds->ds_link;
+ }
+
+-static void ath_rx_buf_relink(struct ath_softc *sc, struct ath_rxbuf *bf)
++static void ath_rx_buf_relink(struct ath_softc *sc, struct ath_rxbuf *bf,
++ bool flush)
+ {
+ if (sc->rx.buf_hold)
+- ath_rx_buf_link(sc, sc->rx.buf_hold);
++ ath_rx_buf_link(sc, sc->rx.buf_hold, flush);
+
+ sc->rx.buf_hold = bf;
+ }
+@@ -442,7 +444,7 @@ int ath_startrecv(struct ath_softc *sc)
+ sc->rx.buf_hold = NULL;
+ sc->rx.rxlink = NULL;
+ list_for_each_entry_safe(bf, tbf, &sc->rx.rxbuf, list) {
+- ath_rx_buf_link(sc, bf);
++ ath_rx_buf_link(sc, bf, false);
+ }
+
+ /* We could have deleted elements so the list may be empty now */
+@@ -1118,12 +1120,12 @@ requeue_drop_frag:
+ requeue:
+ list_add_tail(&bf->list, &sc->rx.rxbuf);
+
+- if (edma) {
+- ath_rx_edma_buf_link(sc, qtype);
+- } else {
+- ath_rx_buf_relink(sc, bf);
++ if (!edma) {
++ ath_rx_buf_relink(sc, bf, flush);
+ if (!flush)
+ ath9k_hw_rxena(ah);
++ } else if (!flush) {
++ ath_rx_edma_buf_link(sc, qtype);
+ }
--#ifdef CONFIG_PM_SLEEP
-+#ifdef CONFIG_ATH9K_WOW
- .suspend = ath9k_suspend,
- .resume = ath9k_resume,
- .set_wakeup = ath9k_set_wakeup,
---- a/drivers/net/wireless/ath/ath9k/wow.c
-+++ b/drivers/net/wireless/ath/ath9k/wow.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012 Qualcomm Atheros, Inc.
-+ * Copyright (c) 2013 Qualcomm Atheros, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
-@@ -14,409 +14,348 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ if (!budget--)
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -227,6 +227,7 @@ struct sta_info *sta_info_get_by_idx(str
*/
-
--#include <linux/export.h>
- #include "ath9k.h"
--#include "reg.h"
--#include "hw-ops.h"
-
--const char *ath9k_hw_wow_event_to_string(u32 wow_event)
-+static const struct wiphy_wowlan_support ath9k_wowlan_support = {
-+ .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
-+ .n_patterns = MAX_NUM_USER_PATTERN,
-+ .pattern_min_len = 1,
-+ .pattern_max_len = MAX_PATTERN_SIZE,
-+};
-+
-+static void ath9k_wow_map_triggers(struct ath_softc *sc,
-+ struct cfg80211_wowlan *wowlan,
-+ u32 *wow_triggers)
- {
-- if (wow_event & AH_WOW_MAGIC_PATTERN_EN)
-- return "Magic pattern";
-- if (wow_event & AH_WOW_USER_PATTERN_EN)
-- return "User pattern";
-- if (wow_event & AH_WOW_LINK_CHANGE)
-- return "Link change";
-- if (wow_event & AH_WOW_BEACON_MISS)
-- return "Beacon miss";
-+ if (wowlan->disconnect)
-+ *wow_triggers |= AH_WOW_LINK_CHANGE |
-+ AH_WOW_BEACON_MISS;
-+ if (wowlan->magic_pkt)
-+ *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
-+
-+ if (wowlan->n_patterns)
-+ *wow_triggers |= AH_WOW_USER_PATTERN_EN;
-+
-+ sc->wow_enabled = *wow_triggers;
-
-- return "unknown reason";
- }
--EXPORT_SYMBOL(ath9k_hw_wow_event_to_string);
-
--static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
-+static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
- {
-+ struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-+ int pattern_count = 0;
-+ int i, byte_cnt;
-+ u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
-+ u8 dis_deauth_mask[MAX_PATTERN_SIZE];
-
-- REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-+ memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
-+ memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
-
-- /* set rx disable bit */
-- REG_WRITE(ah, AR_CR, AR_CR_RXD);
-+ /*
-+ * Create Dissassociate / Deauthenticate packet filter
-+ *
-+ * 2 bytes 2 byte 6 bytes 6 bytes 6 bytes
-+ * +--------------+----------+---------+--------+--------+----
-+ * + Frame Control+ Duration + DA + SA + BSSID +
-+ * +--------------+----------+---------+--------+--------+----
-+ *
-+ * The above is the management frame format for disassociate/
-+ * deauthenticate pattern, from this we need to match the first byte
-+ * of 'Frame Control' and DA, SA, and BSSID fields
-+ * (skipping 2nd byte of FC and Duration feild.
-+ *
-+ * Disassociate pattern
-+ * --------------------
-+ * Frame control = 00 00 1010
-+ * DA, SA, BSSID = x:x:x:x:x:x
-+ * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
-+ * | x:x:x:x:x:x -- 22 bytes
-+ *
-+ * Deauthenticate pattern
-+ * ----------------------
-+ * Frame control = 00 00 1100
-+ * DA, SA, BSSID = x:x:x:x:x:x
-+ * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
-+ * | x:x:x:x:x:x -- 22 bytes
-+ */
-
-- if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {
-- ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
-- REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));
-- return;
-- }
-+ /* Create Disassociate Pattern first */
-
-- REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
--}
-+ byte_cnt = 0;
-
--static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
--{
-- struct ath_common *common = ath9k_hw_common(ah);
-- u8 sta_mac_addr[ETH_ALEN], ap_mac_addr[ETH_ALEN];
-- u32 ctl[13] = {0};
-- u32 data_word[KAL_NUM_DATA_WORDS];
-- u8 i;
-- u32 wow_ka_data_word0;
--
-- memcpy(sta_mac_addr, common->macaddr, ETH_ALEN);
-- memcpy(ap_mac_addr, common->curbssid, ETH_ALEN);
--
-- /* set the transmit buffer */
-- ctl[0] = (KAL_FRAME_LEN | (MAX_RATE_POWER << 16));
-- ctl[1] = 0;
-- ctl[3] = 0xb; /* OFDM_6M hardware value for this rate */
-- ctl[4] = 0;
-- ctl[7] = (ah->txchainmask) << 2;
-- ctl[2] = 0xf << 16; /* tx_tries 0 */
--
-- for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
-- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
--
-- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
--
-- data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
-- (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
-- data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
-- (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
-- data_word[2] = (sta_mac_addr[1] << 24) | (sta_mac_addr[0] << 16) |
-- (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
-- data_word[3] = (sta_mac_addr[5] << 24) | (sta_mac_addr[4] << 16) |
-- (sta_mac_addr[3] << 8) | (sta_mac_addr[2]);
-- data_word[4] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
-- (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
-- data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
--
-- if (AR_SREV_9462_20(ah)) {
-- /* AR9462 2.0 has an extra descriptor word (time based
-- * discard) compared to other chips */
-- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
-- wow_ka_data_word0 = AR_WOW_TXBUF(13);
-- } else {
-- wow_ka_data_word0 = AR_WOW_TXBUF(12);
-- }
-+ /* Fill out the mask with all FF's */
-
-- for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
-- REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
-+ for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
-+ dis_deauth_mask[i] = 0xff;
-
--}
-+ /* copy the first byte of frame control field */
-+ dis_deauth_pattern[byte_cnt] = 0xa0;
-+ byte_cnt++;
-
--void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
-- u8 *user_mask, int pattern_count,
-- int pattern_len)
--{
-- int i;
-- u32 pattern_val, mask_val;
-- u32 set, clr;
-+ /* skip 2nd byte of frame control and Duration field */
-+ byte_cnt += 3;
-
-- /* FIXME: should check count by querying the hardware capability */
-- if (pattern_count >= MAX_NUM_PATTERN)
-- return;
-+ /*
-+ * need not match the destination mac address, it can be a broadcast
-+ * mac address or an unicast to this station
-+ */
-+ byte_cnt += 6;
-
-- REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
-+ /* copy the source mac address */
-+ memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
-
-- /* set the registers for pattern */
-- for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
-- memcpy(&pattern_val, user_pattern, 4);
-- REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
-- pattern_val);
-- user_pattern += 4;
-- }
-+ byte_cnt += 6;
-
-- /* set the registers for mask */
-- for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
-- memcpy(&mask_val, user_mask, 4);
-- REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
-- user_mask += 4;
-- }
-+ /* copy the bssid, its same as the source mac address */
-
-- /* set the pattern length to be matched
-- *
-- * AR_WOW_LENGTH1_REG1
-- * bit 31:24 pattern 0 length
-- * bit 23:16 pattern 1 length
-- * bit 15:8 pattern 2 length
-- * bit 7:0 pattern 3 length
-- *
-- * AR_WOW_LENGTH1_REG2
-- * bit 31:24 pattern 4 length
-- * bit 23:16 pattern 5 length
-- * bit 15:8 pattern 6 length
-- * bit 7:0 pattern 7 length
-- *
-- * the below logic writes out the new
-- * pattern length for the corresponding
-- * pattern_count, while masking out the
-- * other fields
-- */
-+ memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
-
-- ah->wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
-+ /* Create Disassociate pattern mask */
-
-- if (pattern_count < 4) {
-- /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
-- set = (pattern_len & AR_WOW_LENGTH_MAX) <<
-- AR_WOW_LEN1_SHIFT(pattern_count);
-- clr = AR_WOW_LENGTH1_MASK(pattern_count);
-- REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
-- } else {
-- /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
-- set = (pattern_len & AR_WOW_LENGTH_MAX) <<
-- AR_WOW_LEN2_SHIFT(pattern_count);
-- clr = AR_WOW_LENGTH2_MASK(pattern_count);
-- REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
-- }
-+ dis_deauth_mask[0] = 0xfe;
-+ dis_deauth_mask[1] = 0x03;
-+ dis_deauth_mask[2] = 0xc0;
-
--}
--EXPORT_SYMBOL(ath9k_hw_wow_apply_pattern);
-+ ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
-
--u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
--{
-- u32 wow_status = 0;
-- u32 val = 0, rval;
-+ ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
-+ pattern_count, byte_cnt);
-
-+ pattern_count++;
- /*
-- * read the WoW status register to know
-- * the wakeup reason
-+ * for de-authenticate pattern, only the first byte of the frame
-+ * control field gets changed from 0xA0 to 0xC0
- */
-- rval = REG_READ(ah, AR_WOW_PATTERN);
-- val = AR_WOW_STATUS(rval);
-+ dis_deauth_pattern[0] = 0xC0;
-
-- /*
-- * mask only the WoW events that we have enabled. Sometimes
-- * we have spurious WoW events from the AR_WOW_PATTERN
-- * register. This mask will clean it up.
-- */
-+ ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
-+ pattern_count, byte_cnt);
-
-- val &= ah->wow_event_mask;
-+}
-
-- if (val) {
-- if (val & AR_WOW_MAGIC_PAT_FOUND)
-- wow_status |= AH_WOW_MAGIC_PATTERN_EN;
-- if (AR_WOW_PATTERN_FOUND(val))
-- wow_status |= AH_WOW_USER_PATTERN_EN;
-- if (val & AR_WOW_KEEP_ALIVE_FAIL)
-- wow_status |= AH_WOW_LINK_CHANGE;
-- if (val & AR_WOW_BEACON_FAIL)
-- wow_status |= AH_WOW_BEACON_MISS;
-- }
-+static void ath9k_wow_add_pattern(struct ath_softc *sc,
-+ struct cfg80211_wowlan *wowlan)
-+{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath9k_wow_pattern *wow_pattern = NULL;
-+ struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
-+ int mask_len;
-+ s8 i = 0;
-+
-+ if (!wowlan->n_patterns)
-+ return;
-
- /*
-- * set and clear WOW_PME_CLEAR registers for the chip to
-- * generate next wow signal.
-- * disable D3 before accessing other registers ?
-+ * Add the new user configured patterns
- */
-+ for (i = 0; i < wowlan->n_patterns; i++) {
-
-- /* do we need to check the bit value 0x01000000 (7-10) ?? */
-- REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,
-- AR_PMCTRL_PWR_STATE_D1D3);
-+ wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
-
-- /*
-- * clear all events
-- */
-- REG_WRITE(ah, AR_WOW_PATTERN,
-- AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
-+ if (!wow_pattern)
-+ return;
-
-- /*
-- * restore the beacon threshold to init value
-- */
-- REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
-+ /*
-+ * TODO: convert the generic user space pattern to
-+ * appropriate chip specific/802.11 pattern.
-+ */
-
-- /*
-- * Restore the way the PCI-E reset, Power-On-Reset, external
-- * PCIE_POR_SHORT pins are tied to its original value.
-- * Previously just before WoW sleep, we untie the PCI-E
-- * reset to our Chip's Power On Reset so that any PCI-E
-- * reset from the bus will not reset our chip
-- */
-- if (ah->is_pciexpress)
-- ath9k_hw_configpcipowersave(ah, false);
-+ mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
-+ memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
-+ memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
-+ memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
-+ patterns[i].pattern_len);
-+ memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
-+ wow_pattern->pattern_len = patterns[i].pattern_len;
-+
-+ /*
-+ * just need to take care of deauth and disssoc pattern,
-+ * make sure we don't overwrite them.
-+ */
-+
-+ ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
-+ wow_pattern->mask_bytes,
-+ i + 2,
-+ wow_pattern->pattern_len);
-+ kfree(wow_pattern);
-
-- ah->wow_event_mask = 0;
-+ }
-
-- return wow_status;
- }
--EXPORT_SYMBOL(ath9k_hw_wow_wakeup);
-
--void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
-+int ath9k_suspend(struct ieee80211_hw *hw,
-+ struct cfg80211_wowlan *wowlan)
+ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
{
-- u32 wow_event_mask;
-- u32 set, clr;
-+ struct ath_softc *sc = hw->priv;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ u32 wow_triggers_enabled = 0;
-+ int ret = 0;
++ struct ieee80211_sta_rates *rates;
+ int i;
-- /*
-- * wow_event_mask is a mask to the AR_WOW_PATTERN register to
-- * indicate which WoW events we have enabled. The WoW events
-- * are from the 'pattern_enable' in this function and
-- * 'pattern_count' of ath9k_hw_wow_apply_pattern()
-- */
-- wow_event_mask = ah->wow_event_mask;
-+ mutex_lock(&sc->mutex);
-
-- /*
-- * Untie Power-on-Reset from the PCI-E-Reset. When we are in
-- * WOW sleep, we do want the Reset from the PCI-E to disturb
-- * our hw state
-- */
-- if (ah->is_pciexpress) {
-- /*
-- * we need to untie the internal POR (power-on-reset)
-- * to the external PCI-E reset. We also need to tie
-- * the PCI-E Phy reset to the PCI-E reset.
-- */
-- set = AR_WA_RESET_EN | AR_WA_POR_SHORT;
-- clr = AR_WA_UNTIE_RESET_EN | AR_WA_D3_L1_DISABLE;
-- REG_RMW(ah, AR_WA, set, clr);
-+ ath_cancel_work(sc);
-+ ath_stop_ani(sc);
-+ del_timer_sync(&sc->rx_poll_timer);
-+
-+ if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
-+ ath_dbg(common, ANY, "Device not present\n");
-+ ret = -EINVAL;
-+ goto fail_wow;
+ if (sta->rate_ctrl)
+@@ -238,6 +239,10 @@ void sta_info_free(struct ieee80211_loca
+ kfree(sta->tx_lat);
}
-- /*
-- * set the power states appropriately and enable PME
-- */
-- set = AR_PMCTRL_HOST_PME_EN | AR_PMCTRL_PWR_PM_CTRL_ENA |
-- AR_PMCTRL_AUX_PWR_DET | AR_PMCTRL_WOW_PME_CLR;
-+ if (WARN_ON(!wowlan)) {
-+ ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
-+ ret = -EINVAL;
-+ goto fail_wow;
-+ }
-
-- /*
-- * set and clear WOW_PME_CLEAR registers for the chip
-- * to generate next wow signal.
-- */
-- REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
-- clr = AR_PMCTRL_WOW_PME_CLR;
-- REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
-+ if (!device_can_wakeup(sc->dev)) {
-+ ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
-+ ret = 1;
-+ goto fail_wow;
-+ }
-
- /*
-- * Setup for:
-- * - beacon misses
-- * - magic pattern
-- * - keep alive timeout
-- * - pattern matching
-+ * none of the sta vifs are associated
-+ * and we are not currently handling multivif
-+ * cases, for instance we have to seperately
-+ * configure 'keep alive frame' for each
-+ * STA.
- */
-
-- /*
-- * Program default values for pattern backoff, aifs/slot/KAL count,
-- * beacon miss timeout, KAL timeout, etc.
-- */
-- set = AR_WOW_BACK_OFF_SHIFT(AR_WOW_PAT_BACKOFF);
-- REG_SET_BIT(ah, AR_WOW_PATTERN, set);
-+ if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-+ ath_dbg(common, WOW, "None of the STA vifs are associated\n");
-+ ret = 1;
-+ goto fail_wow;
-+ }
-+
-+ if (sc->nvifs > 1) {
-+ ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
-+ ret = 1;
-+ goto fail_wow;
-+ }
-
-- set = AR_WOW_AIFS_CNT(AR_WOW_CNT_AIFS_CNT) |
-- AR_WOW_SLOT_CNT(AR_WOW_CNT_SLOT_CNT) |
-- AR_WOW_KEEP_ALIVE_CNT(AR_WOW_CNT_KA_CNT);
-- REG_SET_BIT(ah, AR_WOW_COUNT, set);
--
-- if (pattern_enable & AH_WOW_BEACON_MISS)
-- set = AR_WOW_BEACON_TIMO;
-- /* We are not using beacon miss, program a large value */
-- else
-- set = AR_WOW_BEACON_TIMO_MAX;
-+ ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
-
-- REG_WRITE(ah, AR_WOW_BCN_TIMO, set);
-+ ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
-+ wow_triggers_enabled);
-
-- /*
-- * Keep alive timo in ms except AR9280
-- */
-- if (!pattern_enable)
-- set = AR_WOW_KEEP_ALIVE_NEVER;
-- else
-- set = KAL_TIMEOUT * 32;
-+ ath9k_ps_wakeup(sc);
-
-- REG_WRITE(ah, AR_WOW_KEEP_ALIVE_TIMO, set);
-+ ath9k_stop_btcoex(sc);
-
- /*
-- * Keep alive delay in us. based on 'power on clock',
-- * therefore in usec
-+ * Enable wake up on recieving disassoc/deauth
-+ * frame by default.
- */
-- set = KAL_DELAY * 1000;
-- REG_WRITE(ah, AR_WOW_KEEP_ALIVE_DELAY, set);
-+ ath9k_wow_add_disassoc_deauth_pattern(sc);
-
-- /*
-- * Create keep alive pattern to respond to beacons
-- */
-- ath9k_wow_create_keep_alive_pattern(ah);
-+ if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
-+ ath9k_wow_add_pattern(sc, wowlan);
-
-+ spin_lock_bh(&sc->sc_pcu_lock);
- /*
-- * Configure MAC WoW Registers
-+ * To avoid false wake, we enable beacon miss interrupt only
-+ * when we go to sleep. We save the current interrupt mask
-+ * so we can restore it after the system wakes up
- */
-- set = 0;
-- /* Send keep alive timeouts anyway */
-- clr = AR_WOW_KEEP_ALIVE_AUTO_DIS;
--
-- if (pattern_enable & AH_WOW_LINK_CHANGE)
-- wow_event_mask |= AR_WOW_KEEP_ALIVE_FAIL;
-- else
-- set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
-+ sc->wow_intr_before_sleep = ah->imask;
-+ ah->imask &= ~ATH9K_INT_GLOBAL;
-+ ath9k_hw_disable_interrupts(ah);
-+ ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
-+ ath9k_hw_set_interrupts(ah);
-+ ath9k_hw_enable_interrupts(ah);
-
-- set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
-- REG_RMW(ah, AR_WOW_KEEP_ALIVE, set, clr);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
-
- /*
-- * we are relying on a bmiss failure. ensure we have
-- * enough threshold to prevent false positives
-+ * we can now sync irq and kill any running tasklets, since we already
-+ * disabled interrupts and not holding a spin lock
- */
-- REG_RMW_FIELD(ah, AR_RSSI_THR, AR_RSSI_THR_BM_THR,
-- AR_WOW_BMISSTHRESHOLD);
-+ synchronize_irq(sc->irq);
-+ tasklet_kill(&sc->intr_tq);
-+
-+ ath9k_hw_wow_enable(ah, wow_triggers_enabled);
-
-- set = 0;
-- clr = 0;
-+ ath9k_ps_restore(sc);
-+ ath_dbg(common, ANY, "WoW enabled in ath9k\n");
-+ atomic_inc(&sc->wow_sleep_proc_intr);
-
-- if (pattern_enable & AH_WOW_BEACON_MISS) {
-- set = AR_WOW_BEACON_FAIL_EN;
-- wow_event_mask |= AR_WOW_BEACON_FAIL;
-- } else {
-- clr = AR_WOW_BEACON_FAIL_EN;
-+fail_wow:
-+ mutex_unlock(&sc->mutex);
-+ return ret;
-+}
-+
-+int ath9k_resume(struct ieee80211_hw *hw)
-+{
-+ struct ath_softc *sc = hw->priv;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ u32 wow_status;
-+
-+ mutex_lock(&sc->mutex);
-+
-+ ath9k_ps_wakeup(sc);
-+
-+ spin_lock_bh(&sc->sc_pcu_lock);
-+
-+ ath9k_hw_disable_interrupts(ah);
-+ ah->imask = sc->wow_intr_before_sleep;
-+ ath9k_hw_set_interrupts(ah);
-+ ath9k_hw_enable_interrupts(ah);
-+
-+ spin_unlock_bh(&sc->sc_pcu_lock);
-+
-+ wow_status = ath9k_hw_wow_wakeup(ah);
++ rates = rcu_dereference_protected(sta->sta.rates, true);
++ if (rates)
++ kfree(rates);
+
-+ if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
-+ /*
-+ * some devices may not pick beacon miss
-+ * as the reason they woke up so we add
-+ * that here for that shortcoming.
-+ */
-+ wow_status |= AH_WOW_BEACON_MISS;
-+ atomic_dec(&sc->wow_got_bmiss_intr);
-+ ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
- }
-
-- REG_RMW(ah, AR_WOW_BCN_EN, set, clr);
-+ atomic_dec(&sc->wow_sleep_proc_intr);
-
-- set = 0;
-- clr = 0;
-- /*
-- * Enable the magic packet registers
-- */
-- if (pattern_enable & AH_WOW_MAGIC_PATTERN_EN) {
-- set = AR_WOW_MAGIC_EN;
-- wow_event_mask |= AR_WOW_MAGIC_PAT_FOUND;
-- } else {
-- clr = AR_WOW_MAGIC_EN;
-+ if (wow_status) {
-+ ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
-+ ath9k_hw_wow_event_to_string(wow_status), wow_status);
- }
-- set |= AR_WOW_MAC_INTR_EN;
-- REG_RMW(ah, AR_WOW_PATTERN, set, clr);
-
-- REG_WRITE(ah, AR_WOW_PATTERN_MATCH_LT_256B,
-- AR_WOW_PATTERN_SUPPORTED);
-+ ath_restart_work(sc);
-+ ath9k_start_btcoex(sc);
-
-- /*
-- * Set the power states appropriately and enable PME
-- */
-- clr = 0;
-- set = AR_PMCTRL_PWR_STATE_D1D3 | AR_PMCTRL_HOST_PME_EN |
-- AR_PMCTRL_PWR_PM_CTRL_ENA;
-+ ath9k_ps_restore(sc);
-+ mutex_unlock(&sc->mutex);
-
-- clr = AR_PCIE_PM_CTRL_ENA;
-- REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
-+ return 0;
-+}
+ sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
-- /*
-- * this is needed to prevent the chip waking up
-- * the host within 3-4 seconds with certain
-- * platform/BIOS. The fix is to enable
-- * D1 & D3 to match original definition and
-- * also match the OTP value. Anyway this
-- * is more related to SW WOW.
-- */
-- clr = AR_PMCTRL_PWR_STATE_D1D3;
-- REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
-+void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
-+{
-+ struct ath_softc *sc = hw->priv;
-
-- set = AR_PMCTRL_PWR_STATE_D1D3_REAL;
-- REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
-+ mutex_lock(&sc->mutex);
-+ device_init_wakeup(sc->dev, 1);
-+ device_set_wakeup_enable(sc->dev, enabled);
-+ mutex_unlock(&sc->mutex);
-+}
+ kfree(sta);
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -541,6 +541,23 @@ static void ieee80211_tx_latency_end_msr
+ */
+ #define STA_LOST_PKT_THRESHOLD 50
-- REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
-+void ath9k_init_wow(struct ieee80211_hw *hw)
++static void ieee80211_lost_packet(struct sta_info *sta, struct sk_buff *skb)
+{
-+ struct ath_softc *sc = hw->priv;
-
-- /* to bring down WOW power low margin */
-- set = BIT(13);
-- REG_SET_BIT(ah, AR_PCIE_PHY_REG3, set);
-- /* HW WoW */
-- clr = BIT(5);
-- REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, clr);
-+ if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
-+ (sc->driver_data & ATH9K_PCI_WOW) &&
-+ device_can_wakeup(sc->dev))
-+ hw->wiphy->wowlan = &ath9k_wowlan_support;
-
-- ath9k_hw_set_powermode_wow_sleep(ah);
-- ah->wow_event_mask = wow_event_mask;
-+ atomic_set(&sc->wow_sleep_proc_intr, -1);
-+ atomic_set(&sc->wow_got_bmiss_intr, -1);
- }
--EXPORT_SYMBOL(ath9k_hw_wow_enable);
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc
- if (!ATH_TXQ_SETUP(sc, i))
- continue;
-
-+ if (!sc->tx.txq[i].axq_depth)
-+ continue;
++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
- if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum))
- npend |= BIT(i);
- }
-@@ -2749,6 +2752,8 @@ void ath_tx_node_cleanup(struct ath_soft
- }
- }
-
-+#ifdef CONFIG_ATH9K_TX99
++ /* This packet was aggregated but doesn't carry status info */
++ if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
++ !(info->flags & IEEE80211_TX_STAT_AMPDU))
++ return;
+
- int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
- struct ath_tx_control *txctl)
- {
-@@ -2791,3 +2796,5 @@ int ath9k_tx99_send(struct ath_softc *sc
-
- return 0;
- }
++ if (++sta->lost_packets < STA_LOST_PKT_THRESHOLD)
++ return;
+
-+#endif /* CONFIG_ATH9K_TX99 */
---- a/drivers/net/wireless/ath/regd.c
-+++ b/drivers/net/wireless/ath/regd.c
-@@ -37,17 +37,17 @@ static int __ath_regd_init(struct ath_re
-
- /* We enable active scan on these a case by case basis by regulatory domain */
- #define ATH9K_2GHZ_CH12_13 REG_RULE(2467-10, 2472+10, 40, 0, 20,\
-- NL80211_RRF_PASSIVE_SCAN)
-+ NL80211_RRF_NO_IR)
- #define ATH9K_2GHZ_CH14 REG_RULE(2484-10, 2484+10, 40, 0, 20,\
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
-+ NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
-
- /* We allow IBSS on these on a case by case basis by regulatory domain */
- #define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5350+10, 80, 0, 30,\
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
- #define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
- #define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 5850+10, 80, 0, 30,\
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- #define ATH9K_2GHZ_ALL ATH9K_2GHZ_CH01_11, \
- ATH9K_2GHZ_CH12_13, \
-@@ -224,17 +224,16 @@ ath_reg_apply_beaconing_flags(struct wip
- * regulatory_hint().
- */
- if (!(reg_rule->flags &
-- NL80211_RRF_NO_IBSS))
-+ NL80211_RRF_NO_IR))
- ch->flags &=
-- ~IEEE80211_CHAN_NO_IBSS;
-+ ~IEEE80211_CHAN_NO_IR;
- if (!(reg_rule->flags &
-- NL80211_RRF_PASSIVE_SCAN))
-+ NL80211_RRF_NO_IR))
- ch->flags &=
-- ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ ~IEEE80211_CHAN_NO_IR;
- } else {
- if (ch->beacon_found)
-- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN);
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
++ cfg80211_cqm_pktloss_notify(sta->sdata->dev, sta->sta.addr,
++ sta->lost_packets, GFP_ATOMIC);
++ sta->lost_packets = 0;
++}
++
+ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
+ {
+ struct sk_buff *skb2;
+@@ -680,12 +697,8 @@ void ieee80211_tx_status(struct ieee8021
+ if (info->flags & IEEE80211_TX_STAT_ACK) {
+ if (sta->lost_packets)
+ sta->lost_packets = 0;
+- } else if (++sta->lost_packets >= STA_LOST_PKT_THRESHOLD) {
+- cfg80211_cqm_pktloss_notify(sta->sdata->dev,
+- sta->sta.addr,
+- sta->lost_packets,
+- GFP_ATOMIC);
+- sta->lost_packets = 0;
++ } else {
++ ieee80211_lost_packet(sta, skb);
}
}
- }
-@@ -260,11 +259,11 @@ ath_reg_apply_active_scan_flags(struct w
- */
- if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
- ch = &sband->channels[11]; /* CH 12 */
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- ch = &sband->channels[12]; /* CH 13 */
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- return;
- }
-
-@@ -278,17 +277,17 @@ ath_reg_apply_active_scan_flags(struct w
- ch = &sband->channels[11]; /* CH 12 */
- reg_rule = freq_reg_info(wiphy, ch->center_freq);
- if (!IS_ERR(reg_rule)) {
-- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
- ch = &sband->channels[12]; /* CH 13 */
- reg_rule = freq_reg_info(wiphy, ch->center_freq);
- if (!IS_ERR(reg_rule)) {
-- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
- }
-
-@@ -320,8 +319,8 @@ static void ath_reg_apply_radar_flags(st
- */
- if (!(ch->flags & IEEE80211_CHAN_DISABLED))
- ch->flags |= IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR;
- }
- }
-
---- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
-@@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct br
- struct ieee80211_channel *chan = request->channels[i];
-
- if (chan->flags & (IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_PASSIVE_SCAN))
-+ IEEE80211_CHAN_NO_IR))
- continue;
-
- chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,
---- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
-@@ -202,9 +202,9 @@ static struct ieee80211_supported_band _
-
- /* This is to override regulatory domains defined in cfg80211 module (reg.c)
- * By default world regulatory domain defined in reg.c puts the flags
-- * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for
-- * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't
-- * start p2p operations on 5GHz channels. All the changes in world regulatory
-+ * NL80211_RRF_NO_IR for 5GHz channels (for * 36..48 and 149..165).
-+ * With respect to these flags, wpa_supplicant doesn't * start p2p
-+ * operations on 5GHz channels. All the changes in world regulatory
- * domain are to be done here.
- */
- static const struct ieee80211_regdomain brcmf_regdom = {
-@@ -5197,10 +5197,10 @@ static s32 brcmf_construct_reginfo(struc
- if (channel & WL_CHAN_RADAR)
- band_chan_arr[index].flags |=
- (IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_NO_IBSS);
-+ IEEE80211_CHAN_NO_IR);
- if (channel & WL_CHAN_PASSIVE)
- band_chan_arr[index].flags |=
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR;
- }
- }
- if (!update)
---- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-@@ -59,23 +59,20 @@
-
- #define BRCM_2GHZ_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
- #define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- #define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
- #define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-+ NL80211_RRF_NO_IR | \
- NL80211_RRF_DFS | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
- #define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-+ NL80211_RRF_NO_IR | \
- NL80211_RRF_DFS | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
- #define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- static const struct ieee80211_regdomain brcms_regdom_x2 = {
- .n_reg_rules = 6,
-@@ -395,7 +392,7 @@ brcms_c_channel_set_chanspec(struct brcm
- brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
-
- brcms_b_set_chanspec(wlc->hw, chanspec,
-- !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
-+ !!(ch->flags & IEEE80211_CHAN_NO_IR),
- &txpwr);
- }
-
-@@ -657,8 +654,8 @@ static void brcms_reg_apply_radar_flags(
- */
- if (!(ch->flags & IEEE80211_CHAN_DISABLED))
- ch->flags |= IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR;
- }
- }
-
-@@ -688,14 +685,13 @@ brcms_reg_apply_beaconing_flags(struct w
- if (IS_ERR(rule))
- continue;
-
-- if (!(rule->flags & NL80211_RRF_NO_IBSS))
-- ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
-- if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
-+ if (!(rule->flags & NL80211_RRF_NO_IR))
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
-+ if (!(rule->flags & NL80211_RRF_NO_IR))
- ch->flags &=
-- ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ ~IEEE80211_CHAN_NO_IR;
- } else if (ch->beacon_found) {
-- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN);
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
- }
- }
---- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -125,13 +125,13 @@ static struct ieee80211_channel brcms_2g
- CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
- CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
- CHAN2GHZ(12, 2467,
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-+ IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_NO_HT40PLUS),
- CHAN2GHZ(13, 2472,
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-+ IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_NO_HT40PLUS),
- CHAN2GHZ(14, 2484,
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-+ IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS |
- IEEE80211_CHAN_NO_OFDM)
- };
-@@ -144,51 +144,51 @@ static struct ieee80211_channel brcms_5g
- CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
- /* UNII-2 */
- CHAN5GHZ(52,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(56,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(60,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(64,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- /* MID */
- CHAN5GHZ(100,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(104,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(108,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(112,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(116,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(120,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(124,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(128,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(132,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
- CHAN5GHZ(136,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
- CHAN5GHZ(140,
-- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
-+ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS |
- IEEE80211_CHAN_NO_HT40MINUS),
- /* UNII-3 */
- CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
---- a/drivers/net/wireless/cw1200/scan.c
-+++ b/drivers/net/wireless/cw1200/scan.c
-@@ -197,9 +197,9 @@ void cw1200_scan_work(struct work_struct
- if ((*it)->band != first->band)
- break;
- if (((*it)->flags ^ first->flags) &
-- IEEE80211_CHAN_PASSIVE_SCAN)
-+ IEEE80211_CHAN_NO_IR)
- break;
-- if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
-+ if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
- (*it)->max_power != first->max_power)
- break;
- }
-@@ -210,7 +210,7 @@ void cw1200_scan_work(struct work_struct
- else
- scan.max_tx_rate = WSM_TRANSMIT_RATE_1;
- scan.num_probes =
-- (first->flags & IEEE80211_CHAN_PASSIVE_SCAN) ? 0 : 2;
-+ (first->flags & IEEE80211_CHAN_NO_IR) ? 0 : 2;
- scan.num_ssids = priv->scan.n_ssids;
- scan.ssids = &priv->scan.ssids[0];
- scan.num_channels = it - priv->scan.curr;
-@@ -233,7 +233,7 @@ void cw1200_scan_work(struct work_struct
- }
- for (i = 0; i < scan.num_channels; ++i) {
- scan.ch[i].number = priv->scan.curr[i]->hw_value;
-- if (priv->scan.curr[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
-+ if (priv->scan.curr[i]->flags & IEEE80211_CHAN_NO_IR) {
- scan.ch[i].min_chan_time = 50;
- scan.ch[i].max_chan_time = 100;
- } else {
-@@ -241,7 +241,7 @@ void cw1200_scan_work(struct work_struct
- scan.ch[i].max_chan_time = 25;
- }
- }
-- if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
-+ if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
- priv->scan.output_power != first->max_power) {
- priv->scan.output_power = first->max_power;
- wsm_set_output_power(priv,
---- a/drivers/net/wireless/ipw2x00/ipw2100.c
-+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -1934,10 +1934,10 @@ static int ipw2100_wdev_init(struct net_
- bg_band->channels[i].max_power = geo->bg[i].max_power;
- if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
- bg_band->channels[i].flags |=
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
- bg_band->channels[i].flags |=
-- IEEE80211_CHAN_NO_IBSS;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
- bg_band->channels[i].flags |=
- IEEE80211_CHAN_RADAR;
---- a/drivers/net/wireless/ipw2x00/ipw2200.c
-+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11472,10 +11472,10 @@ static int ipw_wdev_init(struct net_devi
- bg_band->channels[i].max_power = geo->bg[i].max_power;
- if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
- bg_band->channels[i].flags |=
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
- bg_band->channels[i].flags |=
-- IEEE80211_CHAN_NO_IBSS;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
- bg_band->channels[i].flags |=
- IEEE80211_CHAN_RADAR;
-@@ -11511,10 +11511,10 @@ static int ipw_wdev_init(struct net_devi
- a_band->channels[i].max_power = geo->a[i].max_power;
- if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY)
- a_band->channels[i].flags |=
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->a[i].flags & LIBIPW_CH_NO_IBSS)
- a_band->channels[i].flags |=
-- IEEE80211_CHAN_NO_IBSS;
-+ IEEE80211_CHAN_NO_IR;
- if (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT)
- a_band->channels[i].flags |=
- IEEE80211_CHAN_RADAR;
---- a/drivers/net/wireless/iwlegacy/3945-mac.c
-+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_p
- * and use long active_dwell time.
- */
- if (!is_active || il_is_channel_passive(ch_info) ||
-- (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
-+ (chan->flags & IEEE80211_CHAN_NO_IR)) {
- scan_ch->type = 0; /* passive */
- if (IL_UCODE_API(il->ucode_ver) == 1)
- scan_ch->active_dwell =
---- a/drivers/net/wireless/iwlegacy/4965-mac.c
-+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_p
- }
-
- if (!is_active || il_is_channel_passive(ch_info) ||
-- (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
-+ (chan->flags & IEEE80211_CHAN_NO_IR))
- scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
- else
- scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
---- a/drivers/net/wireless/iwlegacy/common.c
-+++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -3447,10 +3447,10 @@ il_init_geos(struct il_priv *il)
-
- if (il_is_channel_valid(ch)) {
- if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-- geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
-+ geo_ch->flags |= IEEE80211_CHAN_NO_IR;
-
- if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-- geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-+ geo_ch->flags |= IEEE80211_CHAN_NO_IR;
-
- if (ch->flags & EEPROM_CHANNEL_RADAR)
- geo_ch->flags |= IEEE80211_CHAN_RADAR;
---- a/drivers/net/wireless/iwlegacy/debug.c
-+++ b/drivers/net/wireless/iwlegacy/debug.c
-@@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file *file
- flags & IEEE80211_CHAN_RADAR ?
- " (IEEE 802.11h required)" : "",
- ((channels[i].
-- flags & IEEE80211_CHAN_NO_IBSS) ||
-+ flags & IEEE80211_CHAN_NO_IR) ||
- (channels[i].
- flags & IEEE80211_CHAN_RADAR)) ? "" :
- ", IBSS",
- channels[i].
-- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
-+ flags & IEEE80211_CHAN_NO_IR ?
- "passive only" : "active/passive");
- }
- supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
-@@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file *file
- flags & IEEE80211_CHAN_RADAR ?
- " (IEEE 802.11h required)" : "",
- ((channels[i].
-- flags & IEEE80211_CHAN_NO_IBSS) ||
-+ flags & IEEE80211_CHAN_NO_IR) ||
- (channels[i].
- flags & IEEE80211_CHAN_RADAR)) ? "" :
- ", IBSS",
- channels[i].
-- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
-+ flags & IEEE80211_CHAN_NO_IR ?
- "passive only" : "active/passive");
- }
- ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
---- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-@@ -352,12 +352,12 @@ static ssize_t iwl_dbgfs_channels_read(s
- channels[i].max_power,
- channels[i].flags & IEEE80211_CHAN_RADAR ?
- " (IEEE 802.11h required)" : "",
-- ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
-+ ((channels[i].flags & IEEE80211_CHAN_NO_IR)
- || (channels[i].flags &
- IEEE80211_CHAN_RADAR)) ? "" :
- ", IBSS",
- channels[i].flags &
-- IEEE80211_CHAN_PASSIVE_SCAN ?
-+ IEEE80211_CHAN_NO_IR ?
- "passive only" : "active/passive");
- }
- supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
-@@ -375,12 +375,12 @@ static ssize_t iwl_dbgfs_channels_read(s
- channels[i].max_power,
- channels[i].flags & IEEE80211_CHAN_RADAR ?
- " (IEEE 802.11h required)" : "",
-- ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
-+ ((channels[i].flags & IEEE80211_CHAN_NO_IR)
- || (channels[i].flags &
- IEEE80211_CHAN_RADAR)) ? "" :
- ", IBSS",
- channels[i].flags &
-- IEEE80211_CHAN_PASSIVE_SCAN ?
-+ IEEE80211_CHAN_NO_IR ?
- "passive only" : "active/passive");
- }
- ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
---- a/drivers/net/wireless/iwlwifi/dvm/scan.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
-@@ -544,7 +544,7 @@ static int iwl_get_channels_for_scan(str
- channel = chan->hw_value;
- scan_ch->channel = cpu_to_le16(channel);
-
-- if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
-+ if (!is_active || (chan->flags & IEEE80211_CHAN_NO_IR))
- scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
- else
- scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
---- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
-@@ -614,10 +614,10 @@ static int iwl_init_channel_map(struct d
- channel->flags = IEEE80211_CHAN_NO_HT40;
-
- if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
-- channel->flags |= IEEE80211_CHAN_NO_IBSS;
-+ channel->flags |= IEEE80211_CHAN_NO_IR;
-
- if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
-- channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-+ channel->flags |= IEEE80211_CHAN_NO_IR;
-
- if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
- channel->flags |= IEEE80211_CHAN_RADAR;
---- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
-@@ -223,10 +223,10 @@ static int iwl_init_channel_map(struct d
- channel->flags |= IEEE80211_CHAN_NO_160MHZ;
-
- if (!(ch_flags & NVM_CHANNEL_IBSS))
-- channel->flags |= IEEE80211_CHAN_NO_IBSS;
-+ channel->flags |= IEEE80211_CHAN_NO_IR;
-
- if (!(ch_flags & NVM_CHANNEL_ACTIVE))
-- channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-+ channel->flags |= IEEE80211_CHAN_NO_IR;
-
- if (ch_flags & NVM_CHANNEL_RADAR)
- channel->flags |= IEEE80211_CHAN_RADAR;
---- a/drivers/net/wireless/iwlwifi/mvm/scan.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
-@@ -192,7 +192,7 @@ static void iwl_mvm_scan_fill_channels(s
- for (i = 0; i < cmd->channel_count; i++) {
- chan->channel = cpu_to_le16(req->channels[i]->hw_value);
- chan->type = cpu_to_le32(type);
-- if (req->channels[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-+ if (req->channels[i]->flags & IEEE80211_CHAN_NO_IR)
- chan->type &= cpu_to_le32(~SCAN_CHANNEL_TYPE_ACTIVE);
- chan->active_dwell = cpu_to_le16(active_dwell);
- chan->passive_dwell = cpu_to_le16(passive_dwell);
-@@ -642,7 +642,7 @@ static void iwl_build_channel_cfg(struct
- channels->iter_count[index] = cpu_to_le16(1);
- channels->iter_interval[index] = 0;
-
-- if (!(s_band->channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
-+ if (!(s_band->channels[i].flags & IEEE80211_CHAN_NO_IR))
- channels->type[index] |=
- cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_ACTIVE);
-
---- a/drivers/net/wireless/mac80211_hwsim.c
-+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -159,7 +159,7 @@ static const struct ieee80211_regdomain
- .reg_rules = {
- REG_RULE(2412-10, 2462+10, 40, 0, 20, 0),
- REG_RULE(5725-10, 5850+10, 40, 0, 30,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
- }
- };
-
-@@ -1485,7 +1485,7 @@ static void hw_scan_work(struct work_str
- req->channels[hwsim->scan_chan_idx]->center_freq);
-
- hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
-- if (hwsim->tmp_chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
-+ if (hwsim->tmp_chan->flags & IEEE80211_CHAN_NO_IR ||
- !req->n_ssids) {
- dwell = 120;
- } else {
---- a/drivers/net/wireless/mwifiex/cfg80211.c
-+++ b/drivers/net/wireless/mwifiex/cfg80211.c
-@@ -50,24 +50,24 @@ static const struct ieee80211_regdomain
- REG_RULE(2412-10, 2462+10, 40, 3, 20, 0),
- /* Channel 12 - 13 */
- REG_RULE(2467-10, 2472+10, 20, 3, 20,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
- /* Channel 14 */
- REG_RULE(2484-10, 2484+10, 20, 3, 20,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_NO_OFDM),
- /* Channel 36 - 48 */
- REG_RULE(5180-10, 5240+10, 40, 3, 20,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
- /* Channel 149 - 165 */
- REG_RULE(5745-10, 5825+10, 40, 3, 20,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
- /* Channel 52 - 64 */
- REG_RULE(5260-10, 5320+10, 40, 3, 30,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_DFS),
- /* Channel 100 - 140 */
- REG_RULE(5500-10, 5700+10, 40, 3, 30,
-- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_DFS),
- }
- };
-@@ -1968,7 +1968,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiph
- user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
- user_scan_cfg->chan_list[i].radio_type = chan->band;
-
-- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-+ if (chan->flags & IEEE80211_CHAN_NO_IR)
- user_scan_cfg->chan_list[i].scan_type =
- MWIFIEX_SCAN_TYPE_PASSIVE;
- else
---- a/drivers/net/wireless/mwifiex/scan.c
-+++ b/drivers/net/wireless/mwifiex/scan.c
-@@ -515,14 +515,14 @@ mwifiex_scan_create_channel_list(struct
- scan_chan_list[chan_idx].max_scan_time =
- cpu_to_le16((u16) user_scan_in->
- chan_list[0].scan_time);
-- else if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-+ else if (ch->flags & IEEE80211_CHAN_NO_IR)
- scan_chan_list[chan_idx].max_scan_time =
- cpu_to_le16(adapter->passive_scan_time);
- else
- scan_chan_list[chan_idx].max_scan_time =
- cpu_to_le16(adapter->active_scan_time);
-
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
- scan_chan_list[chan_idx].chan_scan_mode_bitmap
- |= MWIFIEX_PASSIVE_SCAN;
- else
---- a/drivers/net/wireless/rt2x00/rt2x00lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
-@@ -146,7 +146,7 @@ void rt2x00queue_remove_l2pad(struct sk_
- * @local: frame is not from mac80211
- */
- int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
-- bool local);
-+ struct ieee80211_sta *sta, bool local);
-
- /**
- * rt2x00queue_update_beacon - Send new beacon from mac80211
---- a/drivers/net/wireless/rt2x00/rt2x00mac.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
-@@ -90,7 +90,7 @@ static int rt2x00mac_tx_rts_cts(struct r
- frag_skb->data, data_length, tx_info,
- (struct ieee80211_rts *)(skb->data));
-
-- retval = rt2x00queue_write_tx_frame(queue, skb, true);
-+ retval = rt2x00queue_write_tx_frame(queue, skb, NULL, true);
- if (retval) {
- dev_kfree_skb_any(skb);
- rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
-@@ -151,7 +151,7 @@ void rt2x00mac_tx(struct ieee80211_hw *h
- goto exit_fail;
- }
-
-- if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
-+ if (unlikely(rt2x00queue_write_tx_frame(queue, skb, control->sta, false)))
- goto exit_fail;
-
- /*
---- a/drivers/net/wireless/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
-@@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct
- }
-
- int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
-- bool local)
-+ struct ieee80211_sta *sta, bool local)
- {
- struct ieee80211_tx_info *tx_info;
- struct queue_entry *entry;
-@@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct da
- * after that we are free to use the skb->cb array
- * for our information.
- */
-- rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL);
-+ rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta);
-
- /*
- * All information is retrieved from the skb->cb array,
---- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
-+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
-@@ -416,7 +416,7 @@ static int rtl8187_init_urbs(struct ieee
- struct rtl8187_rx_info *info;
- int ret = 0;
-
-- while (skb_queue_len(&priv->rx_queue) < 16) {
-+ while (skb_queue_len(&priv->rx_queue) < 32) {
- skb = __dev_alloc_skb(RTL8187_MAX_RX, GFP_KERNEL);
- if (!skb) {
- ret = -ENOMEM;
---- a/drivers/net/wireless/rtlwifi/base.c
-+++ b/drivers/net/wireless/rtlwifi/base.c
-@@ -1078,8 +1078,8 @@ u8 rtl_is_special_data(struct ieee80211_
-
- ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len +
- SNAP_SIZE + PROTOC_TYPE_SIZE);
-- ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE);
-- /* ether_type = ntohs(ether_type); */
-+ ether_type = be16_to_cpu(*(__be16 *)((u8 *)skb->data + mac_hdr_len +
-+ SNAP_SIZE));
-
- if (ETH_P_IP == ether_type) {
- if (IPPROTO_UDP == ip->protocol) {
---- a/drivers/net/wireless/rtlwifi/regd.c
-+++ b/drivers/net/wireless/rtlwifi/regd.c
-@@ -59,30 +59,27 @@ static struct country_code_to_enum_rd al
- */
- #define RTL819x_2GHZ_CH12_13 \
- REG_RULE(2467-10, 2472+10, 40, 0, 20,\
-- NL80211_RRF_PASSIVE_SCAN)
-+ NL80211_RRF_NO_IR)
-
- #define RTL819x_2GHZ_CH14 \
- REG_RULE(2484-10, 2484+10, 40, 0, 20, \
-- NL80211_RRF_PASSIVE_SCAN | \
-+ NL80211_RRF_NO_IR | \
- NL80211_RRF_NO_OFDM)
-
- /* 5G chan 36 - chan 64*/
- #define RTL819x_5GHZ_5150_5350 \
- REG_RULE(5150-10, 5350+10, 40, 0, 30, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- /* 5G chan 100 - chan 165*/
- #define RTL819x_5GHZ_5470_5850 \
- REG_RULE(5470-10, 5850+10, 40, 0, 30, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- /* 5G chan 149 - chan 165*/
- #define RTL819x_5GHZ_5725_5850 \
- REG_RULE(5725-10, 5850+10, 40, 0, 30, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ NL80211_RRF_NO_IR)
-
- #define RTL819x_5GHZ_ALL \
- (RTL819x_5GHZ_5150_5350, RTL819x_5GHZ_5470_5850)
-@@ -185,16 +182,15 @@ static void _rtl_reg_apply_beaconing_fla
- *regulatory_hint().
- */
-
-- if (!(reg_rule->flags & NL80211_RRF_NO_IBSS))
-- ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
-+ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- if (!(reg_rule->
-- flags & NL80211_RRF_PASSIVE_SCAN))
-+ flags & NL80211_RRF_NO_IR))
- ch->flags &=
-- ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ ~IEEE80211_CHAN_NO_IR;
- } else {
- if (ch->beacon_found)
-- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN);
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
- }
- }
-@@ -219,11 +215,11 @@ static void _rtl_reg_apply_active_scan_f
- */
- if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
- ch = &sband->channels[11]; /* CH 12 */
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- ch = &sband->channels[12]; /* CH 13 */
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- return;
- }
-
-@@ -237,17 +233,17 @@ static void _rtl_reg_apply_active_scan_f
- ch = &sband->channels[11]; /* CH 12 */
- reg_rule = freq_reg_info(wiphy, ch->center_freq);
- if (!IS_ERR(reg_rule)) {
-- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
-
- ch = &sband->channels[12]; /* CH 13 */
- reg_rule = freq_reg_info(wiphy, ch->center_freq);
- if (!IS_ERR(reg_rule)) {
-- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-+ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
-+ if (ch->flags & IEEE80211_CHAN_NO_IR)
-+ ch->flags &= ~IEEE80211_CHAN_NO_IR;
- }
- }
-
-@@ -284,8 +280,8 @@ static void _rtl_reg_apply_radar_flags(s
- */
- if (!(ch->flags & IEEE80211_CHAN_DISABLED))
- ch->flags |= IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_NO_IR;
- }
- }
-
---- a/drivers/net/wireless/ti/wl12xx/scan.c
-+++ b/drivers/net/wireless/ti/wl12xx/scan.c
-@@ -47,7 +47,7 @@ static int wl1271_get_scan_channels(stru
- * In active scans, we only scan channels not
- * marked as passive.
- */
-- (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) {
-+ (passive || !(flags & IEEE80211_CHAN_NO_IR))) {
- wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
- req->channels[i]->band,
- req->channels[i]->center_freq);
---- a/drivers/net/wireless/ti/wlcore/cmd.c
-+++ b/drivers/net/wireless/ti/wlcore/cmd.c
-@@ -1688,7 +1688,7 @@ int wlcore_cmd_regdomain_config_locked(s
-
- if (channel->flags & (IEEE80211_CHAN_DISABLED |
- IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_PASSIVE_SCAN))
-+ IEEE80211_CHAN_NO_IR))
- continue;
-
- ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch);
---- a/drivers/net/wireless/ti/wlcore/main.c
-+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -91,8 +91,7 @@ static void wl1271_reg_notify(struct wip
- continue;
-
- if (ch->flags & IEEE80211_CHAN_RADAR)
-- ch->flags |= IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN;
-+ ch->flags |= IEEE80211_CHAN_NO_IR;
-
- }
-
---- a/drivers/net/wireless/ti/wlcore/scan.c
-+++ b/drivers/net/wireless/ti/wlcore/scan.c
-@@ -189,14 +189,14 @@ wlcore_scan_get_channels(struct wl1271 *
- flags = req_channels[i]->flags;
-
- if (force_passive)
-- flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-+ flags |= IEEE80211_CHAN_NO_IR;
-
- if ((req_channels[i]->band == band) &&
- !(flags & IEEE80211_CHAN_DISABLED) &&
- (!!(flags & IEEE80211_CHAN_RADAR) == radar) &&
- /* if radar is set, we ignore the passive flag */
- (radar ||
-- !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {
-+ !!(flags & IEEE80211_CHAN_NO_IR) == passive)) {
-
-
- if (flags & IEEE80211_CHAN_RADAR) {
-@@ -221,7 +221,7 @@ wlcore_scan_get_channels(struct wl1271 *
- (band == IEEE80211_BAND_2GHZ) &&
- (channels[j].channel >= 12) &&
- (channels[j].channel <= 14) &&
-- (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
-+ (flags & IEEE80211_CHAN_NO_IR) &&
- !force_passive) {
- /* pactive channels treated as DFS */
- channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
-@@ -244,7 +244,7 @@ wlcore_scan_get_channels(struct wl1271 *
- max_dwell_time_active,
- flags & IEEE80211_CHAN_RADAR ?
- ", DFS" : "",
-- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
-+ flags & IEEE80211_CHAN_NO_IR ?
- ", PASSIVE" : "");
- j++;
- }
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -91,9 +91,8 @@ enum ieee80211_band {
- * Channel flags set by the regulatory control code.
- *
- * @IEEE80211_CHAN_DISABLED: This channel is disabled.
-- * @IEEE80211_CHAN_PASSIVE_SCAN: Only passive scanning is permitted
-- * on this channel.
-- * @IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel.
-+ * @IEEE80211_CHAN_NO_IR: do not initiate radiation, this includes
-+ * sending probe requests or beaconing.
- * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel.
- * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel
- * is not permitted.
-@@ -113,8 +112,8 @@ enum ieee80211_band {
- */
- enum ieee80211_channel_flags {
- IEEE80211_CHAN_DISABLED = 1<<0,
-- IEEE80211_CHAN_PASSIVE_SCAN = 1<<1,
-- IEEE80211_CHAN_NO_IBSS = 1<<2,
-+ IEEE80211_CHAN_NO_IR = 1<<1,
-+ /* hole at 1<<2 */
- IEEE80211_CHAN_RADAR = 1<<3,
- IEEE80211_CHAN_NO_HT40PLUS = 1<<4,
- IEEE80211_CHAN_NO_HT40MINUS = 1<<5,
-@@ -4149,6 +4148,7 @@ void cfg80211_radar_event(struct wiphy *
- /**
- * cfg80211_cac_event - Channel availability check (CAC) event
- * @netdev: network device
-+ * @chandef: chandef for the current channel
- * @event: type of event
- * @gfp: context flags
- *
-@@ -4157,6 +4157,7 @@ void cfg80211_radar_event(struct wiphy *
- * also by full-MAC drivers.
- */
- void cfg80211_cac_event(struct net_device *netdev,
-+ const struct cfg80211_chan_def *chandef,
- enum nl80211_radar_event event, gfp_t gfp);
-
-
---- a/include/uapi/linux/nl80211.h
-+++ b/include/uapi/linux/nl80211.h
-@@ -1508,6 +1508,9 @@ enum nl80211_commands {
- * to react to radar events, e.g. initiate a channel switch or leave the
- * IBSS network.
- *
-+ * @NL80211_ATTR_SUPPORT_5_10_MHZ: A flag indicating that the device supports
-+ * 5 MHz and 10 MHz channel bandwidth.
-+ *
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- */
-@@ -1824,6 +1827,8 @@ enum nl80211_attrs {
-
- NL80211_ATTR_HANDLE_DFS,
-
-+ NL80211_ATTR_SUPPORT_5_10_MHZ,
-+
- /* add attributes here, update the policy in nl80211.c */
-
- __NL80211_ATTR_AFTER_LAST,
-@@ -2224,10 +2229,9 @@ enum nl80211_band_attr {
- * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
- * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
- * regulatory domain.
-- * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is
-- * permitted on this channel in current regulatory domain.
-- * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted
-- * on this channel in current regulatory domain.
-+ * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation
-+ * are permitted on this channel, this includes sending probe
-+ * requests, or modes of operation that require beaconing.
- * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
- * on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
-@@ -2254,8 +2258,8 @@ enum nl80211_frequency_attr {
- __NL80211_FREQUENCY_ATTR_INVALID,
- NL80211_FREQUENCY_ATTR_FREQ,
- NL80211_FREQUENCY_ATTR_DISABLED,
-- NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
-- NL80211_FREQUENCY_ATTR_NO_IBSS,
-+ NL80211_FREQUENCY_ATTR_NO_IR,
-+ __NL80211_FREQUENCY_ATTR_NO_IBSS,
- NL80211_FREQUENCY_ATTR_RADAR,
- NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
- NL80211_FREQUENCY_ATTR_DFS_STATE,
-@@ -2271,6 +2275,9 @@ enum nl80211_frequency_attr {
- };
-
- #define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
-+#define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN NL80211_FREQUENCY_ATTR_NO_IR
-+#define NL80211_FREQUENCY_ATTR_NO_IBSS NL80211_FREQUENCY_ATTR_NO_IR
-+#define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR
-
- /**
- * enum nl80211_bitrate_attr - bitrate attributes
-@@ -2413,8 +2420,9 @@ enum nl80211_sched_scan_match_attr {
- * @NL80211_RRF_DFS: DFS support is required to be used
- * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
- * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
-- * @NL80211_RRF_PASSIVE_SCAN: passive scan is required
-- * @NL80211_RRF_NO_IBSS: no IBSS is allowed
-+ * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
-+ * this includes probe requests or modes of operation that require
-+ * beaconing.
- */
- enum nl80211_reg_rule_flags {
- NL80211_RRF_NO_OFDM = 1<<0,
-@@ -2424,10 +2432,17 @@ enum nl80211_reg_rule_flags {
- NL80211_RRF_DFS = 1<<4,
- NL80211_RRF_PTP_ONLY = 1<<5,
- NL80211_RRF_PTMP_ONLY = 1<<6,
-- NL80211_RRF_PASSIVE_SCAN = 1<<7,
-- NL80211_RRF_NO_IBSS = 1<<8,
-+ NL80211_RRF_NO_IR = 1<<7,
-+ __NL80211_RRF_NO_IBSS = 1<<8,
- };
-
-+#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
-+#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
-+#define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
-+
-+/* For backport compatibility with older userspace */
-+#define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
-+
- /**
- * enum nl80211_dfs_regions - regulatory DFS regions
- *
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -1050,6 +1050,7 @@ static int ieee80211_stop_ap(struct wiph
- struct ieee80211_local *local = sdata->local;
- struct beacon_data *old_beacon;
- struct probe_resp *old_probe_resp;
-+ struct cfg80211_chan_def chandef;
-
- old_beacon = rtnl_dereference(sdata->u.ap.beacon);
- if (!old_beacon)
-@@ -1091,8 +1092,10 @@ static int ieee80211_stop_ap(struct wiph
- ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
-
- if (sdata->wdev.cac_started) {
-+ chandef = sdata->vif.bss_conf.chandef;
- cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
-- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,
-+ cfg80211_cac_event(sdata->dev, &chandef,
-+ NL80211_RADAR_CAC_ABORTED,
- GFP_KERNEL);
- }
-
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -749,6 +749,7 @@ static void ieee80211_do_stop(struct iee
- u32 hw_reconf_flags = 0;
- int i, flushed;
- struct ps_data *ps;
-+ struct cfg80211_chan_def chandef;
-
- clear_bit(SDATA_STATE_RUNNING, &sdata->state);
-
-@@ -828,11 +829,13 @@ static void ieee80211_do_stop(struct iee
- cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
-
- if (sdata->wdev.cac_started) {
-+ chandef = sdata->vif.bss_conf.chandef;
- WARN_ON(local->suspended);
- mutex_lock(&local->iflist_mtx);
- ieee80211_vif_release_channel(sdata);
- mutex_unlock(&local->iflist_mtx);
-- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,
-+ cfg80211_cac_event(sdata->dev, &chandef,
-+ NL80211_RADAR_CAC_ABORTED,
- GFP_KERNEL);
- }
-
-@@ -1340,7 +1343,6 @@ static void ieee80211_setup_sdata(struct
- sdata->vif.bss_conf.bssid = NULL;
- break;
- case NL80211_IFTYPE_AP_VLAN:
-- break;
- case NL80211_IFTYPE_P2P_DEVICE:
- sdata->vif.bss_conf.bssid = sdata->vif.addr;
- break;
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -1398,10 +1398,12 @@ void ieee80211_dfs_cac_timer_work(struct
- struct ieee80211_sub_if_data *sdata =
- container_of(delayed_work, struct ieee80211_sub_if_data,
- dfs_cac_timer_work);
-+ struct cfg80211_chan_def chandef = sdata->vif.bss_conf.chandef;
-
- ieee80211_vif_release_channel(sdata);
--
-- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_FINISHED, GFP_KERNEL);
-+ cfg80211_cac_event(sdata->dev, &chandef,
-+ NL80211_RADAR_CAC_FINISHED,
-+ GFP_KERNEL);
- }
-
- /* MLME */
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -729,9 +729,7 @@ static void ieee80211_release_reorder_fr
- lockdep_assert_held(&tid_agg_rx->reorder_lock);
-
- while (ieee80211_sn_less(tid_agg_rx->head_seq_num, head_seq_num)) {
-- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
-- tid_agg_rx->ssn) %
-- tid_agg_rx->buf_size;
-+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
- ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
- frames);
- }
-@@ -757,8 +755,7 @@ static void ieee80211_sta_reorder_releas
- lockdep_assert_held(&tid_agg_rx->reorder_lock);
-
- /* release the buffer until next missing frame */
-- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
-- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
-+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
- if (!tid_agg_rx->reorder_buf[index] &&
- tid_agg_rx->stored_mpdu_num) {
- /*
-@@ -793,15 +790,11 @@ static void ieee80211_sta_reorder_releas
- } else while (tid_agg_rx->reorder_buf[index]) {
- ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
- frames);
-- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
-- tid_agg_rx->ssn) %
-- tid_agg_rx->buf_size;
-+ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
- }
-
- if (tid_agg_rx->stored_mpdu_num) {
-- j = index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
-- tid_agg_rx->ssn) %
-- tid_agg_rx->buf_size;
-+ j = index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
-
- for (; j != (index - 1) % tid_agg_rx->buf_size;
- j = (j + 1) % tid_agg_rx->buf_size) {
-@@ -861,8 +854,7 @@ static bool ieee80211_sta_manage_reorder
-
- /* Now the new frame is always in the range of the reordering buffer */
-
-- index = ieee80211_sn_sub(mpdu_seq_num,
-- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
-+ index = mpdu_seq_num % tid_agg_rx->buf_size;
-
- /* check if we already stored this frame */
- if (tid_agg_rx->reorder_buf[index]) {
---- a/net/mac80211/scan.c
-+++ b/net/mac80211/scan.c
-@@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct
- ieee80211_hw_config(local, 0);
-
- if ((req->channels[0]->flags &
-- IEEE80211_CHAN_PASSIVE_SCAN) ||
-+ IEEE80211_CHAN_NO_IR) ||
- !local->scan_req->n_ssids) {
- next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
- } else {
-@@ -572,7 +572,7 @@ ieee80211_scan_get_channel_time(struct i
- * TODO: channel switching also consumes quite some time,
- * add that delay as well to get a better estimation
- */
-- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
-+ if (chan->flags & IEEE80211_CHAN_NO_IR)
- return IEEE80211_PASSIVE_CHANNEL_TIME;
- return IEEE80211_PROBE_DELAY + IEEE80211_CHANNEL_TIME;
- }
-@@ -696,7 +696,7 @@ static void ieee80211_scan_state_set_cha
- *
- * In any case, it is not necessary for a passive scan.
- */
-- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
-+ if (chan->flags & IEEE80211_CHAN_NO_IR ||
- !local->scan_req->n_ssids) {
- *next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
- local->next_scan_state = SCAN_DECISION;
-@@ -881,7 +881,7 @@ int ieee80211_request_ibss_scan(struct i
- struct ieee80211_channel *tmp_ch =
- &local->hw.wiphy->bands[band]->channels[i];
-
-- if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
-+ if (tmp_ch->flags & (IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_DISABLED))
- continue;
-
-@@ -895,7 +895,7 @@ int ieee80211_request_ibss_scan(struct i
-
- local->int_scan_req->n_channels = n_ch;
- } else {
-- if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
-+ if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_DISABLED)))
- goto unlock;
-
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -1728,8 +1728,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
- * radar detection by itself. We can do that later by adding a
- * monitor flag interfaces used for AP support.
- */
-- if ((chan->flags & (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_RADAR |
-- IEEE80211_CHAN_PASSIVE_SCAN)))
-+ if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)))
- goto fail_rcu;
-
- ieee80211_xmit(sdata, skb, chan->band);
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -2259,14 +2259,17 @@ u64 ieee80211_calculate_rx_timestamp(str
- void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
- {
- struct ieee80211_sub_if_data *sdata;
-+ struct cfg80211_chan_def chandef;
-
- mutex_lock(&local->iflist_mtx);
- list_for_each_entry(sdata, &local->interfaces, list) {
- cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
-
- if (sdata->wdev.cac_started) {
-+ chandef = sdata->vif.bss_conf.chandef;
- ieee80211_vif_release_channel(sdata);
- cfg80211_cac_event(sdata->dev,
-+ &chandef,
- NL80211_RADAR_CAC_ABORTED,
- GFP_KERNEL);
- }
---- a/net/wireless/chan.c
-+++ b/net/wireless/chan.c
-@@ -277,6 +277,32 @@ void cfg80211_set_dfs_state(struct wiphy
- width, dfs_state);
- }
-
-+static u32 cfg80211_get_start_freq(u32 center_freq,
-+ u32 bandwidth)
-+{
-+ u32 start_freq;
-+
-+ if (bandwidth <= 20)
-+ start_freq = center_freq;
-+ else
-+ start_freq = center_freq - bandwidth/2 + 10;
-+
-+ return start_freq;
-+}
-+
-+static u32 cfg80211_get_end_freq(u32 center_freq,
-+ u32 bandwidth)
-+{
-+ u32 end_freq;
-+
-+ if (bandwidth <= 20)
-+ end_freq = center_freq;
-+ else
-+ end_freq = center_freq + bandwidth/2 - 10;
-+
-+ return end_freq;
-+}
-+
- static int cfg80211_get_chans_dfs_required(struct wiphy *wiphy,
- u32 center_freq,
- u32 bandwidth)
-@@ -284,13 +310,8 @@ static int cfg80211_get_chans_dfs_requir
- struct ieee80211_channel *c;
- u32 freq, start_freq, end_freq;
-
-- if (bandwidth <= 20) {
-- start_freq = center_freq;
-- end_freq = center_freq;
-- } else {
-- start_freq = center_freq - bandwidth/2 + 10;
-- end_freq = center_freq + bandwidth/2 - 10;
-- }
-+ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
-+ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
-
- for (freq = start_freq; freq <= end_freq; freq += 20) {
- c = ieee80211_get_channel(wiphy, freq);
-@@ -330,33 +351,159 @@ int cfg80211_chandef_dfs_required(struct
- }
- EXPORT_SYMBOL(cfg80211_chandef_dfs_required);
-
--static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,
-- u32 center_freq, u32 bandwidth,
-- u32 prohibited_flags)
-+static int cfg80211_get_chans_dfs_usable(struct wiphy *wiphy,
-+ u32 center_freq,
-+ u32 bandwidth)
- {
- struct ieee80211_channel *c;
- u32 freq, start_freq, end_freq;
-+ int count = 0;
-
-- if (bandwidth <= 20) {
-- start_freq = center_freq;
-- end_freq = center_freq;
-- } else {
-- start_freq = center_freq - bandwidth/2 + 10;
-- end_freq = center_freq + bandwidth/2 - 10;
-+ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
-+ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
-+
-+ /*
-+ * Check entire range of channels for the bandwidth.
-+ * Check all channels are DFS channels (DFS_USABLE or
-+ * DFS_AVAILABLE). Return number of usable channels
-+ * (require CAC). Allow DFS and non-DFS channel mix.
-+ */
-+ for (freq = start_freq; freq <= end_freq; freq += 20) {
-+ c = ieee80211_get_channel(wiphy, freq);
-+ if (!c)
-+ return -EINVAL;
-+
-+ if (c->flags & IEEE80211_CHAN_DISABLED)
-+ return -EINVAL;
-+
-+ if (c->flags & IEEE80211_CHAN_RADAR) {
-+ if (c->dfs_state == NL80211_DFS_UNAVAILABLE)
-+ return -EINVAL;
-+
-+ if (c->dfs_state == NL80211_DFS_USABLE)
-+ count++;
-+ }
-+ }
-+
-+ return count;
-+}
-+
-+bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
-+ const struct cfg80211_chan_def *chandef)
-+{
-+ int width;
-+ int r1, r2 = 0;
-+
-+ if (WARN_ON(!cfg80211_chandef_valid(chandef)))
-+ return false;
-+
-+ width = cfg80211_chandef_get_width(chandef);
-+ if (width < 0)
-+ return false;
-+
-+ r1 = cfg80211_get_chans_dfs_usable(wiphy, chandef->center_freq1,
-+ width);
-+
-+ if (r1 < 0)
-+ return false;
-+
-+ switch (chandef->width) {
-+ case NL80211_CHAN_WIDTH_80P80:
-+ WARN_ON(!chandef->center_freq2);
-+ r2 = cfg80211_get_chans_dfs_usable(wiphy,
-+ chandef->center_freq2,
-+ width);
-+ if (r2 < 0)
-+ return false;
-+ break;
-+ default:
-+ WARN_ON(chandef->center_freq2);
-+ break;
- }
-
-+ return (r1 + r2 > 0);
-+}
-+
-+
-+static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy,
-+ u32 center_freq,
-+ u32 bandwidth)
-+{
-+ struct ieee80211_channel *c;
-+ u32 freq, start_freq, end_freq;
-+
-+ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
-+ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
-+
-+ /*
-+ * Check entire range of channels for the bandwidth.
-+ * If any channel in between is disabled or has not
-+ * had gone through CAC return false
-+ */
- for (freq = start_freq; freq <= end_freq; freq += 20) {
- c = ieee80211_get_channel(wiphy, freq);
- if (!c)
- return false;
-
-- /* check for radar flags */
-- if ((prohibited_flags & c->flags & IEEE80211_CHAN_RADAR) &&
-+ if (c->flags & IEEE80211_CHAN_DISABLED)
-+ return false;
-+
-+ if ((c->flags & IEEE80211_CHAN_RADAR) &&
- (c->dfs_state != NL80211_DFS_AVAILABLE))
- return false;
-+ }
-+
-+ return true;
-+}
-+
-+static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy,
-+ const struct cfg80211_chan_def *chandef)
-+{
-+ int width;
-+ int r;
-+
-+ if (WARN_ON(!cfg80211_chandef_valid(chandef)))
-+ return false;
-
-- /* check for the other flags */
-- if (c->flags & prohibited_flags & ~IEEE80211_CHAN_RADAR)
-+ width = cfg80211_chandef_get_width(chandef);
-+ if (width < 0)
-+ return false;
-+
-+ r = cfg80211_get_chans_dfs_available(wiphy, chandef->center_freq1,
-+ width);
-+
-+ /* If any of channels unavailable for cf1 just return */
-+ if (!r)
-+ return r;
-+
-+ switch (chandef->width) {
-+ case NL80211_CHAN_WIDTH_80P80:
-+ WARN_ON(!chandef->center_freq2);
-+ r = cfg80211_get_chans_dfs_available(wiphy,
-+ chandef->center_freq2,
-+ width);
-+ default:
-+ WARN_ON(chandef->center_freq2);
-+ break;
-+ }
-+
-+ return r;
-+}
-+
-+
-+static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,
-+ u32 center_freq, u32 bandwidth,
-+ u32 prohibited_flags)
-+{
-+ struct ieee80211_channel *c;
-+ u32 freq, start_freq, end_freq;
-+
-+ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
-+ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
-+
-+ for (freq = start_freq; freq <= end_freq; freq += 20) {
-+ c = ieee80211_get_channel(wiphy, freq);
-+ if (!c || c->flags & prohibited_flags)
- return false;
- }
-
-@@ -462,14 +609,19 @@ bool cfg80211_reg_can_beacon(struct wiph
- struct cfg80211_chan_def *chandef)
- {
- bool res;
-+ u32 prohibited_flags = IEEE80211_CHAN_DISABLED |
-+ IEEE80211_CHAN_NO_IR |
-+ IEEE80211_CHAN_RADAR;
-
- trace_cfg80211_reg_can_beacon(wiphy, chandef);
-
-- res = cfg80211_chandef_usable(wiphy, chandef,
-- IEEE80211_CHAN_DISABLED |
-- IEEE80211_CHAN_PASSIVE_SCAN |
-- IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_RADAR);
-+ if (cfg80211_chandef_dfs_required(wiphy, chandef) > 0 &&
-+ cfg80211_chandef_dfs_available(wiphy, chandef)) {
-+ /* We can skip IEEE80211_CHAN_NO_IR if chandef dfs available */
-+ prohibited_flags = IEEE80211_CHAN_DISABLED;
-+ }
-+
-+ res = cfg80211_chandef_usable(wiphy, chandef, prohibited_flags);
-
- trace_cfg80211_return_bool(res);
- return res;
---- a/net/wireless/core.h
-+++ b/net/wireless/core.h
-@@ -382,6 +382,19 @@ int cfg80211_can_use_iftype_chan(struct
- enum cfg80211_chan_mode chanmode,
- u8 radar_detect);
-
-+/**
-+ * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable
-+ * @wiphy: the wiphy to validate against
-+ * @chandef: the channel definition to check
-+ *
-+ * Checks if chandef is usable and we can/need start CAC on such channel.
-+ *
-+ * Return: Return true if all channels available and at least
-+ * one channel require CAC (NL80211_DFS_USABLE)
-+ */
-+bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
-+ const struct cfg80211_chan_def *chandef);
-+
- void cfg80211_set_dfs_state(struct wiphy *wiphy,
- const struct cfg80211_chan_def *chandef,
- enum nl80211_dfs_state dfs_state);
---- a/net/wireless/genregdb.awk
-+++ b/net/wireless/genregdb.awk
-@@ -107,10 +107,13 @@ active && /^[ \t]*\(/ {
- } else if (flagarray[arg] == "PTMP-ONLY") {
- flags = flags "\n\t\t\tNL80211_RRF_PTMP_ONLY | "
- } else if (flagarray[arg] == "PASSIVE-SCAN") {
-- flags = flags "\n\t\t\tNL80211_RRF_PASSIVE_SCAN | "
-+ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
- } else if (flagarray[arg] == "NO-IBSS") {
-- flags = flags "\n\t\t\tNL80211_RRF_NO_IBSS | "
-+ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
-+ } else if (flagarray[arg] == "NO-IR") {
-+ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
- }
-+
- }
- flags = flags "0"
- printf "\t\tREG_RULE(%d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, flags
---- a/net/wireless/ibss.c
-+++ b/net/wireless/ibss.c
-@@ -274,7 +274,7 @@ int cfg80211_ibss_wext_join(struct cfg80
-
- for (i = 0; i < sband->n_channels; i++) {
- chan = &sband->channels[i];
-- if (chan->flags & IEEE80211_CHAN_NO_IBSS)
-+ if (chan->flags & IEEE80211_CHAN_NO_IR)
- continue;
- if (chan->flags & IEEE80211_CHAN_DISABLED)
- continue;
-@@ -345,7 +345,7 @@ int cfg80211_ibss_wext_siwfreq(struct ne
- chan = ieee80211_get_channel(wdev->wiphy, freq);
- if (!chan)
- return -EINVAL;
-- if (chan->flags & IEEE80211_CHAN_NO_IBSS ||
-+ if (chan->flags & IEEE80211_CHAN_NO_IR ||
- chan->flags & IEEE80211_CHAN_DISABLED)
- return -EINVAL;
- }
---- a/net/wireless/mesh.c
-+++ b/net/wireless/mesh.c
-@@ -141,8 +141,7 @@ int __cfg80211_join_mesh(struct cfg80211
-
- for (i = 0; i < sband->n_channels; i++) {
- chan = &sband->channels[i];
-- if (chan->flags & (IEEE80211_CHAN_NO_IBSS |
-- IEEE80211_CHAN_PASSIVE_SCAN |
-+ if (chan->flags & (IEEE80211_CHAN_NO_IR |
- IEEE80211_CHAN_DISABLED |
- IEEE80211_CHAN_RADAR))
- continue;
---- a/net/wireless/mlme.c
-+++ b/net/wireless/mlme.c
-@@ -763,12 +763,12 @@ void cfg80211_radar_event(struct wiphy *
- EXPORT_SYMBOL(cfg80211_radar_event);
-
- void cfg80211_cac_event(struct net_device *netdev,
-+ const struct cfg80211_chan_def *chandef,
- enum nl80211_radar_event event, gfp_t gfp)
- {
- struct wireless_dev *wdev = netdev->ieee80211_ptr;
- struct wiphy *wiphy = wdev->wiphy;
- struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
-- struct cfg80211_chan_def chandef;
- unsigned long timeout;
-
- trace_cfg80211_cac_event(netdev, event);
-@@ -779,14 +779,12 @@ void cfg80211_cac_event(struct net_devic
- if (WARN_ON(!wdev->channel))
- return;
-
-- cfg80211_chandef_create(&chandef, wdev->channel, NL80211_CHAN_NO_HT);
--
- switch (event) {
- case NL80211_RADAR_CAC_FINISHED:
- timeout = wdev->cac_start_time +
- msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS);
- WARN_ON(!time_after_eq(jiffies, timeout));
-- cfg80211_set_dfs_state(wiphy, &chandef, NL80211_DFS_AVAILABLE);
-+ cfg80211_set_dfs_state(wiphy, chandef, NL80211_DFS_AVAILABLE);
- break;
- case NL80211_RADAR_CAC_ABORTED:
- break;
-@@ -796,6 +794,6 @@ void cfg80211_cac_event(struct net_devic
- }
- wdev->cac_started = false;
-
-- nl80211_radar_notify(rdev, &chandef, event, netdev, gfp);
-+ nl80211_radar_notify(rdev, chandef, event, netdev, gfp);
- }
- EXPORT_SYMBOL(cfg80211_cac_event);
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -545,12 +545,12 @@ static int nl80211_msg_put_channel(struc
- if ((chan->flags & IEEE80211_CHAN_DISABLED) &&
- nla_put_flag(msg, NL80211_FREQUENCY_ATTR_DISABLED))
- goto nla_put_failure;
-- if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
-- nla_put_flag(msg, NL80211_FREQUENCY_ATTR_PASSIVE_SCAN))
-- goto nla_put_failure;
-- if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&
-- nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IBSS))
-- goto nla_put_failure;
-+ if (chan->flags & IEEE80211_CHAN_NO_IR) {
-+ if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IR))
-+ goto nla_put_failure;
-+ if (nla_put_flag(msg, __NL80211_FREQUENCY_ATTR_NO_IBSS))
-+ goto nla_put_failure;
-+ }
- if (chan->flags & IEEE80211_CHAN_RADAR) {
- if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
- goto nla_put_failure;
-@@ -1229,7 +1229,7 @@ static int nl80211_send_wiphy(struct cfg
- nla_put_flag(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP))
- goto nla_put_failure;
- if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&
-- nla_put_flag(msg, WIPHY_FLAG_SUPPORTS_5_10_MHZ))
-+ nla_put_flag(msg, NL80211_ATTR_SUPPORT_5_10_MHZ))
- goto nla_put_failure;
-
- state->split_start++;
-@@ -2170,7 +2170,7 @@ static inline u64 wdev_id(struct wireles
- }
-
- static int nl80211_send_chandef(struct sk_buff *msg,
-- struct cfg80211_chan_def *chandef)
-+ const struct cfg80211_chan_def *chandef)
- {
- WARN_ON(!cfg80211_chandef_valid(chandef));
-
-@@ -5653,7 +5653,7 @@ static int nl80211_start_radar_detection
- if (err == 0)
- return -EINVAL;
-
-- if (chandef.chan->dfs_state != NL80211_DFS_USABLE)
-+ if (!cfg80211_chandef_dfs_usable(wdev->wiphy, &chandef))
- return -EINVAL;
-
- if (!rdev->ops->start_radar_detection)
-@@ -10882,7 +10882,7 @@ EXPORT_SYMBOL(cfg80211_cqm_txe_notify);
-
- void
- nl80211_radar_notify(struct cfg80211_registered_device *rdev,
-- struct cfg80211_chan_def *chandef,
-+ const struct cfg80211_chan_def *chandef,
- enum nl80211_radar_event event,
- struct net_device *netdev, gfp_t gfp)
- {
---- a/net/wireless/nl80211.h
-+++ b/net/wireless/nl80211.h
-@@ -70,7 +70,7 @@ int nl80211_send_mgmt(struct cfg80211_re
-
- void
- nl80211_radar_notify(struct cfg80211_registered_device *rdev,
-- struct cfg80211_chan_def *chandef,
-+ const struct cfg80211_chan_def *chandef,
- enum nl80211_radar_event event,
- struct net_device *netdev, gfp_t gfp);
-
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -163,35 +163,29 @@ static const struct ieee80211_regdomain
- REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
- /* IEEE 802.11b/g, channels 12..13. */
- REG_RULE(2467-10, 2472+10, 40, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
- /* IEEE 802.11 channel 14 - Only JP enables
- * this and for 802.11b only */
- REG_RULE(2484-10, 2484+10, 20, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_NO_OFDM),
- /* IEEE 802.11a, channel 36..48 */
- REG_RULE(5180-10, 5240+10, 160, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
-
- /* IEEE 802.11a, channel 52..64 - DFS required */
- REG_RULE(5260-10, 5320+10, 160, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_DFS),
-
- /* IEEE 802.11a, channel 100..144 - DFS required */
- REG_RULE(5500-10, 5720+10, 160, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS |
-+ NL80211_RRF_NO_IR |
- NL80211_RRF_DFS),
-
- /* IEEE 802.11a, channel 149..165 */
- REG_RULE(5745-10, 5825+10, 80, 6, 20,
-- NL80211_RRF_PASSIVE_SCAN |
-- NL80211_RRF_NO_IBSS),
-+ NL80211_RRF_NO_IR),
-
- /* IEEE 802.11ad (60gHz), channels 1..3 */
- REG_RULE(56160+2160*1-1080, 56160+2160*3+1080, 2160, 0, 0, 0),
-@@ -698,10 +692,8 @@ regdom_intersect(const struct ieee80211_
- static u32 map_regdom_flags(u32 rd_flags)
- {
- u32 channel_flags = 0;
-- if (rd_flags & NL80211_RRF_PASSIVE_SCAN)
-- channel_flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-- if (rd_flags & NL80211_RRF_NO_IBSS)
-- channel_flags |= IEEE80211_CHAN_NO_IBSS;
-+ if (rd_flags & NL80211_RRF_NO_IR_ALL)
-+ channel_flags |= IEEE80211_CHAN_NO_IR;
- if (rd_flags & NL80211_RRF_DFS)
- channel_flags |= IEEE80211_CHAN_RADAR;
- if (rd_flags & NL80211_RRF_NO_OFDM)
-@@ -1066,13 +1058,8 @@ static void handle_reg_beacon(struct wip
- chan_before.center_freq = chan->center_freq;
- chan_before.flags = chan->flags;
-
-- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
-- chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
-- channel_changed = true;
-- }
--
-- if (chan->flags & IEEE80211_CHAN_NO_IBSS) {
-- chan->flags &= ~IEEE80211_CHAN_NO_IBSS;
-+ if (chan->flags & IEEE80211_CHAN_NO_IR) {
-+ chan->flags &= ~IEEE80211_CHAN_NO_IR;
- channel_changed = true;
- }
-
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
-@@ -0,0 +1,422 @@
-+/*
-+ * Copyright (c) 2012 Qualcomm Atheros, Inc.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/export.h>
-+#include "ath9k.h"
-+#include "reg.h"
-+#include "hw-ops.h"
-+
-+const char *ath9k_hw_wow_event_to_string(u32 wow_event)
-+{
-+ if (wow_event & AH_WOW_MAGIC_PATTERN_EN)
-+ return "Magic pattern";
-+ if (wow_event & AH_WOW_USER_PATTERN_EN)
-+ return "User pattern";
-+ if (wow_event & AH_WOW_LINK_CHANGE)
-+ return "Link change";
-+ if (wow_event & AH_WOW_BEACON_MISS)
-+ return "Beacon miss";
-+
-+ return "unknown reason";
-+}
-+EXPORT_SYMBOL(ath9k_hw_wow_event_to_string);
-+
-+static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
-+{
-+ struct ath_common *common = ath9k_hw_common(ah);
-+
-+ REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-+
-+ /* set rx disable bit */
-+ REG_WRITE(ah, AR_CR, AR_CR_RXD);
-+
-+ if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {
-+ ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
-+ REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));
-+ return;
-+ }
-+
-+ REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
-+}
-+
-+static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
-+{
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ u8 sta_mac_addr[ETH_ALEN], ap_mac_addr[ETH_ALEN];
-+ u32 ctl[13] = {0};
-+ u32 data_word[KAL_NUM_DATA_WORDS];
-+ u8 i;
-+ u32 wow_ka_data_word0;
-+
-+ memcpy(sta_mac_addr, common->macaddr, ETH_ALEN);
-+ memcpy(ap_mac_addr, common->curbssid, ETH_ALEN);
-+
-+ /* set the transmit buffer */
-+ ctl[0] = (KAL_FRAME_LEN | (MAX_RATE_POWER << 16));
-+ ctl[1] = 0;
-+ ctl[3] = 0xb; /* OFDM_6M hardware value for this rate */
-+ ctl[4] = 0;
-+ ctl[7] = (ah->txchainmask) << 2;
-+ ctl[2] = 0xf << 16; /* tx_tries 0 */
-+
-+ for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
-+ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
-+
-+ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
-+
-+ data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
-+ (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
-+ data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
-+ (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
-+ data_word[2] = (sta_mac_addr[1] << 24) | (sta_mac_addr[0] << 16) |
-+ (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
-+ data_word[3] = (sta_mac_addr[5] << 24) | (sta_mac_addr[4] << 16) |
-+ (sta_mac_addr[3] << 8) | (sta_mac_addr[2]);
-+ data_word[4] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
-+ (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
-+ data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
-+
-+ if (AR_SREV_9462_20(ah)) {
-+ /* AR9462 2.0 has an extra descriptor word (time based
-+ * discard) compared to other chips */
-+ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
-+ wow_ka_data_word0 = AR_WOW_TXBUF(13);
-+ } else {
-+ wow_ka_data_word0 = AR_WOW_TXBUF(12);
-+ }
-+
-+ for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
-+ REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
-+
-+}
-+
-+void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
-+ u8 *user_mask, int pattern_count,
-+ int pattern_len)
-+{
-+ int i;
-+ u32 pattern_val, mask_val;
-+ u32 set, clr;
-+
-+ /* FIXME: should check count by querying the hardware capability */
-+ if (pattern_count >= MAX_NUM_PATTERN)
-+ return;
-+
-+ REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
-+
-+ /* set the registers for pattern */
-+ for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
-+ memcpy(&pattern_val, user_pattern, 4);
-+ REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
-+ pattern_val);
-+ user_pattern += 4;
-+ }
-+
-+ /* set the registers for mask */
-+ for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
-+ memcpy(&mask_val, user_mask, 4);
-+ REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
-+ user_mask += 4;
-+ }
-+
-+ /* set the pattern length to be matched
-+ *
-+ * AR_WOW_LENGTH1_REG1
-+ * bit 31:24 pattern 0 length
-+ * bit 23:16 pattern 1 length
-+ * bit 15:8 pattern 2 length
-+ * bit 7:0 pattern 3 length
-+ *
-+ * AR_WOW_LENGTH1_REG2
-+ * bit 31:24 pattern 4 length
-+ * bit 23:16 pattern 5 length
-+ * bit 15:8 pattern 6 length
-+ * bit 7:0 pattern 7 length
-+ *
-+ * the below logic writes out the new
-+ * pattern length for the corresponding
-+ * pattern_count, while masking out the
-+ * other fields
-+ */
-+
-+ ah->wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
-+
-+ if (pattern_count < 4) {
-+ /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
-+ set = (pattern_len & AR_WOW_LENGTH_MAX) <<
-+ AR_WOW_LEN1_SHIFT(pattern_count);
-+ clr = AR_WOW_LENGTH1_MASK(pattern_count);
-+ REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
-+ } else {
-+ /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
-+ set = (pattern_len & AR_WOW_LENGTH_MAX) <<
-+ AR_WOW_LEN2_SHIFT(pattern_count);
-+ clr = AR_WOW_LENGTH2_MASK(pattern_count);
-+ REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
-+ }
-+
-+}
-+EXPORT_SYMBOL(ath9k_hw_wow_apply_pattern);
-+
-+u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
-+{
-+ u32 wow_status = 0;
-+ u32 val = 0, rval;
-+
-+ /*
-+ * read the WoW status register to know
-+ * the wakeup reason
-+ */
-+ rval = REG_READ(ah, AR_WOW_PATTERN);
-+ val = AR_WOW_STATUS(rval);
-+
-+ /*
-+ * mask only the WoW events that we have enabled. Sometimes
-+ * we have spurious WoW events from the AR_WOW_PATTERN
-+ * register. This mask will clean it up.
-+ */
-+
-+ val &= ah->wow_event_mask;
-+
-+ if (val) {
-+ if (val & AR_WOW_MAGIC_PAT_FOUND)
-+ wow_status |= AH_WOW_MAGIC_PATTERN_EN;
-+ if (AR_WOW_PATTERN_FOUND(val))
-+ wow_status |= AH_WOW_USER_PATTERN_EN;
-+ if (val & AR_WOW_KEEP_ALIVE_FAIL)
-+ wow_status |= AH_WOW_LINK_CHANGE;
-+ if (val & AR_WOW_BEACON_FAIL)
-+ wow_status |= AH_WOW_BEACON_MISS;
-+ }
-+
-+ /*
-+ * set and clear WOW_PME_CLEAR registers for the chip to
-+ * generate next wow signal.
-+ * disable D3 before accessing other registers ?
-+ */
-+
-+ /* do we need to check the bit value 0x01000000 (7-10) ?? */
-+ REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,
-+ AR_PMCTRL_PWR_STATE_D1D3);
-+
-+ /*
-+ * clear all events
-+ */
-+ REG_WRITE(ah, AR_WOW_PATTERN,
-+ AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
-+
-+ /*
-+ * restore the beacon threshold to init value
-+ */
-+ REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
-+
-+ /*
-+ * Restore the way the PCI-E reset, Power-On-Reset, external
-+ * PCIE_POR_SHORT pins are tied to its original value.
-+ * Previously just before WoW sleep, we untie the PCI-E
-+ * reset to our Chip's Power On Reset so that any PCI-E
-+ * reset from the bus will not reset our chip
-+ */
-+ if (ah->is_pciexpress)
-+ ath9k_hw_configpcipowersave(ah, false);
-+
-+ ah->wow_event_mask = 0;
-+
-+ return wow_status;
-+}
-+EXPORT_SYMBOL(ath9k_hw_wow_wakeup);
-+
-+void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
-+{
-+ u32 wow_event_mask;
-+ u32 set, clr;
-+
-+ /*
-+ * wow_event_mask is a mask to the AR_WOW_PATTERN register to
-+ * indicate which WoW events we have enabled. The WoW events
-+ * are from the 'pattern_enable' in this function and
-+ * 'pattern_count' of ath9k_hw_wow_apply_pattern()
-+ */
-+ wow_event_mask = ah->wow_event_mask;
-+
-+ /*
-+ * Untie Power-on-Reset from the PCI-E-Reset. When we are in
-+ * WOW sleep, we do want the Reset from the PCI-E to disturb
-+ * our hw state
-+ */
-+ if (ah->is_pciexpress) {
-+ /*
-+ * we need to untie the internal POR (power-on-reset)
-+ * to the external PCI-E reset. We also need to tie
-+ * the PCI-E Phy reset to the PCI-E reset.
-+ */
-+ set = AR_WA_RESET_EN | AR_WA_POR_SHORT;
-+ clr = AR_WA_UNTIE_RESET_EN | AR_WA_D3_L1_DISABLE;
-+ REG_RMW(ah, AR_WA, set, clr);
-+ }
-+
-+ /*
-+ * set the power states appropriately and enable PME
-+ */
-+ set = AR_PMCTRL_HOST_PME_EN | AR_PMCTRL_PWR_PM_CTRL_ENA |
-+ AR_PMCTRL_AUX_PWR_DET | AR_PMCTRL_WOW_PME_CLR;
-+
-+ /*
-+ * set and clear WOW_PME_CLEAR registers for the chip
-+ * to generate next wow signal.
-+ */
-+ REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
-+ clr = AR_PMCTRL_WOW_PME_CLR;
-+ REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
-+
-+ /*
-+ * Setup for:
-+ * - beacon misses
-+ * - magic pattern
-+ * - keep alive timeout
-+ * - pattern matching
-+ */
-+
-+ /*
-+ * Program default values for pattern backoff, aifs/slot/KAL count,
-+ * beacon miss timeout, KAL timeout, etc.
-+ */
-+ set = AR_WOW_BACK_OFF_SHIFT(AR_WOW_PAT_BACKOFF);
-+ REG_SET_BIT(ah, AR_WOW_PATTERN, set);
-+
-+ set = AR_WOW_AIFS_CNT(AR_WOW_CNT_AIFS_CNT) |
-+ AR_WOW_SLOT_CNT(AR_WOW_CNT_SLOT_CNT) |
-+ AR_WOW_KEEP_ALIVE_CNT(AR_WOW_CNT_KA_CNT);
-+ REG_SET_BIT(ah, AR_WOW_COUNT, set);
-+
-+ if (pattern_enable & AH_WOW_BEACON_MISS)
-+ set = AR_WOW_BEACON_TIMO;
-+ /* We are not using beacon miss, program a large value */
-+ else
-+ set = AR_WOW_BEACON_TIMO_MAX;
-+
-+ REG_WRITE(ah, AR_WOW_BCN_TIMO, set);
-+
-+ /*
-+ * Keep alive timo in ms except AR9280
-+ */
-+ if (!pattern_enable)
-+ set = AR_WOW_KEEP_ALIVE_NEVER;
-+ else
-+ set = KAL_TIMEOUT * 32;
-+
-+ REG_WRITE(ah, AR_WOW_KEEP_ALIVE_TIMO, set);
-+
-+ /*
-+ * Keep alive delay in us. based on 'power on clock',
-+ * therefore in usec
-+ */
-+ set = KAL_DELAY * 1000;
-+ REG_WRITE(ah, AR_WOW_KEEP_ALIVE_DELAY, set);
-+
-+ /*
-+ * Create keep alive pattern to respond to beacons
-+ */
-+ ath9k_wow_create_keep_alive_pattern(ah);
-+
-+ /*
-+ * Configure MAC WoW Registers
-+ */
-+ set = 0;
-+ /* Send keep alive timeouts anyway */
-+ clr = AR_WOW_KEEP_ALIVE_AUTO_DIS;
-+
-+ if (pattern_enable & AH_WOW_LINK_CHANGE)
-+ wow_event_mask |= AR_WOW_KEEP_ALIVE_FAIL;
-+ else
-+ set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
-+
-+ set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
-+ REG_RMW(ah, AR_WOW_KEEP_ALIVE, set, clr);
-+
-+ /*
-+ * we are relying on a bmiss failure. ensure we have
-+ * enough threshold to prevent false positives
-+ */
-+ REG_RMW_FIELD(ah, AR_RSSI_THR, AR_RSSI_THR_BM_THR,
-+ AR_WOW_BMISSTHRESHOLD);
-+
-+ set = 0;
-+ clr = 0;
-+
-+ if (pattern_enable & AH_WOW_BEACON_MISS) {
-+ set = AR_WOW_BEACON_FAIL_EN;
-+ wow_event_mask |= AR_WOW_BEACON_FAIL;
-+ } else {
-+ clr = AR_WOW_BEACON_FAIL_EN;
-+ }
-+
-+ REG_RMW(ah, AR_WOW_BCN_EN, set, clr);
-+
-+ set = 0;
-+ clr = 0;
-+ /*
-+ * Enable the magic packet registers
-+ */
-+ if (pattern_enable & AH_WOW_MAGIC_PATTERN_EN) {
-+ set = AR_WOW_MAGIC_EN;
-+ wow_event_mask |= AR_WOW_MAGIC_PAT_FOUND;
-+ } else {
-+ clr = AR_WOW_MAGIC_EN;
-+ }
-+ set |= AR_WOW_MAC_INTR_EN;
-+ REG_RMW(ah, AR_WOW_PATTERN, set, clr);
-+
-+ REG_WRITE(ah, AR_WOW_PATTERN_MATCH_LT_256B,
-+ AR_WOW_PATTERN_SUPPORTED);
-+
-+ /*
-+ * Set the power states appropriately and enable PME
-+ */
-+ clr = 0;
-+ set = AR_PMCTRL_PWR_STATE_D1D3 | AR_PMCTRL_HOST_PME_EN |
-+ AR_PMCTRL_PWR_PM_CTRL_ENA;
-+
-+ clr = AR_PCIE_PM_CTRL_ENA;
-+ REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
-+
-+ /*
-+ * this is needed to prevent the chip waking up
-+ * the host within 3-4 seconds with certain
-+ * platform/BIOS. The fix is to enable
-+ * D1 & D3 to match original definition and
-+ * also match the OTP value. Anyway this
-+ * is more related to SW WOW.
-+ */
-+ clr = AR_PMCTRL_PWR_STATE_D1D3;
-+ REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
-+
-+ set = AR_PMCTRL_PWR_STATE_D1D3_REAL;
-+ REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
-+
-+ REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
-+
-+ /* to bring down WOW power low margin */
-+ set = BIT(13);
-+ REG_SET_BIT(ah, AR_PCIE_PHY_REG3, set);
-+ /* HW WoW */
-+ clr = BIT(5);
-+ REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, clr);
-+
-+ ath9k_hw_set_powermode_wow_sleep(ah);
-+ ah->wow_event_mask = wow_event_mask;
-+}
-+EXPORT_SYMBOL(ath9k_hw_wow_enable);
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/tx99.c
-@@ -0,0 +1,263 @@
-+/*
-+ * Copyright (c) 2013 Qualcomm Atheros, Inc.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "ath9k.h"
-+
-+static void ath9k_tx99_stop(struct ath_softc *sc)
-+{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+
-+ ath_drain_all_txq(sc);
-+ ath_startrecv(sc);
-+
-+ ath9k_hw_set_interrupts(ah);
-+ ath9k_hw_enable_interrupts(ah);
-+
-+ ieee80211_wake_queues(sc->hw);
-+
-+ kfree_skb(sc->tx99_skb);
-+ sc->tx99_skb = NULL;
-+ sc->tx99_state = false;
-+
-+ ath9k_hw_tx99_stop(sc->sc_ah);
-+ ath_dbg(common, XMIT, "TX99 stopped\n");
-+}
-+
-+static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
-+{
-+ static u8 PN9Data[] = {0xff, 0x87, 0xb8, 0x59, 0xb7, 0xa1, 0xcc, 0x24,
-+ 0x57, 0x5e, 0x4b, 0x9c, 0x0e, 0xe9, 0xea, 0x50,
-+ 0x2a, 0xbe, 0xb4, 0x1b, 0xb6, 0xb0, 0x5d, 0xf1,
-+ 0xe6, 0x9a, 0xe3, 0x45, 0xfd, 0x2c, 0x53, 0x18,
-+ 0x0c, 0xca, 0xc9, 0xfb, 0x49, 0x37, 0xe5, 0xa8,
-+ 0x51, 0x3b, 0x2f, 0x61, 0xaa, 0x72, 0x18, 0x84,
-+ 0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
-+ 0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
-+ u32 len = 1200;
-+ struct ieee80211_hw *hw = sc->hw;
-+ struct ieee80211_hdr *hdr;
-+ struct ieee80211_tx_info *tx_info;
-+ struct sk_buff *skb;
-+
-+ skb = alloc_skb(len, GFP_KERNEL);
-+ if (!skb)
-+ return NULL;
-+
-+ skb_put(skb, len);
-+
-+ memset(skb->data, 0, len);
-+
-+ hdr = (struct ieee80211_hdr *)skb->data;
-+ hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA);
-+ hdr->duration_id = 0;
-+
-+ memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
-+ memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
-+ memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
-+
-+ hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
-+
-+ tx_info = IEEE80211_SKB_CB(skb);
-+ memset(tx_info, 0, sizeof(*tx_info));
-+ tx_info->band = hw->conf.chandef.chan->band;
-+ tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
-+ tx_info->control.vif = sc->tx99_vif;
-+
-+ memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));
-+
-+ return skb;
-+}
-+
-+static void ath9k_tx99_deinit(struct ath_softc *sc)
-+{
-+ ath_reset(sc);
-+
-+ ath9k_ps_wakeup(sc);
-+ ath9k_tx99_stop(sc);
-+ ath9k_ps_restore(sc);
-+}
-+
-+static int ath9k_tx99_init(struct ath_softc *sc)
-+{
-+ struct ieee80211_hw *hw = sc->hw;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath_tx_control txctl;
-+ int r;
-+
-+ if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
-+ ath_err(common,
-+ "driver is in invalid state unable to use TX99");
-+ return -EINVAL;
-+ }
-+
-+ sc->tx99_skb = ath9k_build_tx99_skb(sc);
-+ if (!sc->tx99_skb)
-+ return -ENOMEM;
-+
-+ memset(&txctl, 0, sizeof(txctl));
-+ txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
-+
-+ ath_reset(sc);
-+
-+ ath9k_ps_wakeup(sc);
-+
-+ ath9k_hw_disable_interrupts(ah);
-+ atomic_set(&ah->intr_ref_cnt, -1);
-+ ath_drain_all_txq(sc);
-+ ath_stoprecv(sc);
-+
-+ sc->tx99_state = true;
-+
-+ ieee80211_stop_queues(hw);
-+
-+ if (sc->tx99_power == MAX_RATE_POWER + 1)
-+ sc->tx99_power = MAX_RATE_POWER;
-+
-+ ath9k_hw_tx99_set_txpower(ah, sc->tx99_power);
-+ r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
-+ if (r) {
-+ ath_dbg(common, XMIT, "Failed to xmit TX99 skb\n");
-+ return r;
-+ }
-+
-+ ath_dbg(common, XMIT, "TX99 xmit started using %d ( %ddBm)\n",
-+ sc->tx99_power,
-+ sc->tx99_power / 2);
-+
-+ /* We leave the harware awake as it will be chugging on */
-+
-+ return 0;
-+}
-+
-+static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ath_softc *sc = file->private_data;
-+ char buf[3];
-+ unsigned int len;
-+
-+ len = sprintf(buf, "%d\n", sc->tx99_state);
-+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+}
-+
-+static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ath_softc *sc = file->private_data;
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ char buf[32];
-+ bool start;
-+ ssize_t len;
-+ int r;
-+
-+ if (sc->nvifs > 1)
-+ return -EOPNOTSUPP;
-+
-+ len = min(count, sizeof(buf) - 1);
-+ if (copy_from_user(buf, user_buf, len))
-+ return -EFAULT;
-+
-+ if (strtobool(buf, &start))
-+ return -EINVAL;
-+
-+ if (start == sc->tx99_state) {
-+ if (!start)
-+ return count;
-+ ath_dbg(common, XMIT, "Resetting TX99\n");
-+ ath9k_tx99_deinit(sc);
-+ }
-+
-+ if (!start) {
-+ ath9k_tx99_deinit(sc);
-+ return count;
-+ }
-+
-+ r = ath9k_tx99_init(sc);
-+ if (r)
-+ return r;
-+
-+ return count;
-+}
-+
-+static const struct file_operations fops_tx99 = {
-+ .read = read_file_tx99,
-+ .write = write_file_tx99,
-+ .open = simple_open,
-+ .owner = THIS_MODULE,
-+ .llseek = default_llseek,
-+};
-+
-+static ssize_t read_file_tx99_power(struct file *file,
-+ char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ath_softc *sc = file->private_data;
-+ char buf[32];
-+ unsigned int len;
-+
-+ len = sprintf(buf, "%d (%d dBm)\n",
-+ sc->tx99_power,
-+ sc->tx99_power / 2);
-+
-+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+}
-+
-+static ssize_t write_file_tx99_power(struct file *file,
-+ const char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ath_softc *sc = file->private_data;
-+ int r;
-+ u8 tx_power;
-+
-+ r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
-+ if (r)
-+ return r;
-+
-+ if (tx_power > MAX_RATE_POWER)
-+ return -EINVAL;
-+
-+ sc->tx99_power = tx_power;
-+
-+ ath9k_ps_wakeup(sc);
-+ ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
-+ ath9k_ps_restore(sc);
-+
-+ return count;
-+}
-+
-+static const struct file_operations fops_tx99_power = {
-+ .read = read_file_tx99_power,
-+ .write = write_file_tx99_power,
-+ .open = simple_open,
-+ .owner = THIS_MODULE,
-+ .llseek = default_llseek,
-+};
-+
-+void ath9k_tx99_init_debug(struct ath_softc *sc)
-+{
-+ if (!AR_SREV_9300_20_OR_LATER(sc->sc_ah))
-+ return;
-+
-+ debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
-+ sc->debug.debugfs_phy, sc,
-+ &fops_tx99);
-+ debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
-+ sc->debug.debugfs_phy, sc,
-+ &fops_tx99_power);
-+}
projects / openwrt / openwrt.git / blobdiff