ath9k: merge initval updates
[openwrt.git] / package / kernel / mac80211 / patches / 300-pending_work.patch
1 --- a/drivers/net/wireless/ath/ath10k/mac.c
2 +++ b/drivers/net/wireless/ath/ath10k/mac.c
3 @@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(st
4                         ch->allow_vht = true;
5  
6                         ch->allow_ibss =
7 -                               !(channel->flags & IEEE80211_CHAN_NO_IBSS);
8 +                               !(channel->flags & IEEE80211_CHAN_NO_IR);
9  
10                         ch->ht40plus =
11                                 !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
12  
13 -                       passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
14 +                       passive = channel->flags & IEEE80211_CHAN_NO_IR;
15                         ch->passive = passive;
16  
17                         ch->freq = channel->center_freq;
18 --- a/drivers/net/wireless/ath/ath9k/Kconfig
19 +++ b/drivers/net/wireless/ath/ath9k/Kconfig
20 @@ -90,7 +90,7 @@ config ATH9K_DFS_CERTIFIED
21  
22  config ATH9K_TX99
23         bool "Atheros ath9k TX99 testing support"
24 -       depends on CFG80211_CERTIFICATION_ONUS
25 +       depends on ATH9K_DEBUGFS && CFG80211_CERTIFICATION_ONUS
26         default n
27         ---help---
28           Say N. This should only be enabled on systems undergoing
29 @@ -108,6 +108,14 @@ config ATH9K_TX99
30           be evaluated to meet the RF exposure limits set forth in the
31           governmental SAR regulations.
32  
33 +config ATH9K_WOW
34 +       bool "Wake on Wireless LAN support (EXPERIMENTAL)"
35 +       depends on ATH9K && PM
36 +       default n
37 +       ---help---
38 +         This option enables Wake on Wireless LAN support for certain cards.
39 +         Currently, AR9462 is supported.
40 +
41  config ATH9K_LEGACY_RATE_CONTROL
42         bool "Atheros ath9k rate control"
43         depends on ATH9K
44 --- a/drivers/net/wireless/ath/ath9k/Makefile
45 +++ b/drivers/net/wireless/ath/ath9k/Makefile
46 @@ -13,9 +13,9 @@ ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
47  ath9k-$(CPTCFG_ATH9K_AHB) += ahb.o
48  ath9k-$(CPTCFG_ATH9K_DEBUGFS) += debug.o
49  ath9k-$(CPTCFG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
50 -ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += \
51 -               dfs.o
52 -ath9k-$(CONFIG_PM_SLEEP) += wow.o
53 +ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += dfs.o
54 +ath9k-$(CPTCFG_ATH9K_TX99) += tx99.o
55 +ath9k-$(CPTCFG_ATH9K_WOW) += wow.o
56  
57  obj-$(CPTCFG_ATH9K) += ath9k.o
58  
59 @@ -41,6 +41,8 @@ ath9k_hw-y:=  \
60                 ar9003_eeprom.o \
61                 ar9003_paprd.o
62  
63 +ath9k_hw-$(CPTCFG_ATH9K_WOW) += ar9003_wow.o
64 +
65  ath9k_hw-$(CPTCFG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \
66                                            ar9003_mci.o
67  obj-$(CPTCFG_ATH9K_HW) += ath9k_hw.o
68 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
69 +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
70 @@ -26,6 +26,7 @@
71  #include "ar9462_2p0_initvals.h"
72  #include "ar9462_2p1_initvals.h"
73  #include "ar9565_1p0_initvals.h"
74 +#include "ar9565_1p1_initvals.h"
75  
76  /* General hardware code for the AR9003 hadware family */
77  
78 @@ -187,17 +188,17 @@ static void ar9003_hw_init_mode_regs(str
79                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
80                                ar9485_1_1_baseband_core_txfir_coeff_japan_2484);
81  
82 -               /* Load PCIE SERDES settings from INI */
83 -
84 -               /* Awake Setting */
85 -
86 -               INIT_INI_ARRAY(&ah->iniPcieSerdes,
87 -                               ar9485_1_1_pcie_phy_clkreq_disable_L1);
88 -
89 -               /* Sleep Setting */
90 -
91 -               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
92 -                               ar9485_1_1_pcie_phy_clkreq_disable_L1);
93 +               if (ah->config.no_pll_pwrsave) {
94 +                       INIT_INI_ARRAY(&ah->iniPcieSerdes,
95 +                                      ar9485_1_1_pcie_phy_clkreq_disable_L1);
96 +                       INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
97 +                                      ar9485_1_1_pcie_phy_clkreq_disable_L1);
98 +               } else {
99 +                       INIT_INI_ARRAY(&ah->iniPcieSerdes,
100 +                                      ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
101 +                       INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
102 +                                      ar9485_1_1_pll_on_cdr_on_clkreq_disable_L1);
103 +               }
104         } else if (AR_SREV_9462_21(ah)) {
105                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
106                                ar9462_2p1_mac_core);
107 @@ -223,6 +224,10 @@ static void ar9003_hw_init_mode_regs(str
108                                ar9462_2p1_modes_fast_clock);
109                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
110                                ar9462_2p1_baseband_core_txfir_coeff_japan_2484);
111 +               INIT_INI_ARRAY(&ah->iniPcieSerdes,
112 +                              ar9462_2p1_pciephy_clkreq_disable_L1);
113 +               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
114 +                              ar9462_2p1_pciephy_clkreq_disable_L1);
115         } else if (AR_SREV_9462_20(ah)) {
116  
117                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core);
118 @@ -247,18 +252,18 @@ static void ar9003_hw_init_mode_regs(str
119                                 ar9462_2p0_soc_postamble);
120  
121                 INIT_INI_ARRAY(&ah->iniModesRxGain,
122 -                               ar9462_common_rx_gain_table_2p0);
123 +                               ar9462_2p0_common_rx_gain);
124  
125                 /* Awake -> Sleep Setting */
126                 INIT_INI_ARRAY(&ah->iniPcieSerdes,
127 -                              ar9462_pciephy_clkreq_disable_L1_2p0);
128 +                              ar9462_2p0_pciephy_clkreq_disable_L1);
129                 /* Sleep -> Awake Setting */
130                 INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
131 -                              ar9462_pciephy_clkreq_disable_L1_2p0);
132 +                              ar9462_2p0_pciephy_clkreq_disable_L1);
133  
134                 /* Fast clock modal settings */
135                 INIT_INI_ARRAY(&ah->iniModesFastClock,
136 -                               ar9462_modes_fast_clock_2p0);
137 +                               ar9462_2p0_modes_fast_clock);
138  
139                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
140                                ar9462_2p0_baseband_core_txfir_coeff_japan_2484);
141 @@ -331,6 +336,41 @@ static void ar9003_hw_init_mode_regs(str
142  
143                 INIT_INI_ARRAY(&ah->iniModesFastClock,
144                                 ar9580_1p0_modes_fast_clock);
145 +       } else if (AR_SREV_9565_11_OR_LATER(ah)) {
146 +               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
147 +                              ar9565_1p1_mac_core);
148 +               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
149 +                              ar9565_1p1_mac_postamble);
150 +
151 +               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
152 +                              ar9565_1p1_baseband_core);
153 +               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
154 +                              ar9565_1p1_baseband_postamble);
155 +
156 +               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
157 +                              ar9565_1p1_radio_core);
158 +               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
159 +                              ar9565_1p1_radio_postamble);
160 +
161 +               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
162 +                              ar9565_1p1_soc_preamble);
163 +               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
164 +                              ar9565_1p1_soc_postamble);
165 +
166 +               INIT_INI_ARRAY(&ah->iniModesRxGain,
167 +                              ar9565_1p1_Common_rx_gain_table);
168 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
169 +                              ar9565_1p1_Modes_lowest_ob_db_tx_gain_table);
170 +
171 +               INIT_INI_ARRAY(&ah->iniPcieSerdes,
172 +                              ar9565_1p1_pciephy_clkreq_disable_L1);
173 +               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
174 +                              ar9565_1p1_pciephy_clkreq_disable_L1);
175 +
176 +               INIT_INI_ARRAY(&ah->iniModesFastClock,
177 +                               ar9565_1p1_modes_fast_clock);
178 +               INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
179 +                              ar9565_1p1_baseband_core_txfir_coeff_japan_2484);
180         } else if (AR_SREV_9565(ah)) {
181                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
182                                ar9565_1p0_mac_core);
183 @@ -440,7 +480,10 @@ static void ar9003_tx_gain_table_mode0(s
184                         ar9462_2p1_modes_low_ob_db_tx_gain);
185         else if (AR_SREV_9462_20(ah))
186                 INIT_INI_ARRAY(&ah->iniModesTxGain,
187 -                       ar9462_modes_low_ob_db_tx_gain_table_2p0);
188 +                       ar9462_2p0_modes_low_ob_db_tx_gain);
189 +       else if (AR_SREV_9565_11(ah))
190 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
191 +                              ar9565_1p1_modes_low_ob_db_tx_gain_table);
192         else if (AR_SREV_9565(ah))
193                 INIT_INI_ARRAY(&ah->iniModesTxGain,
194                                ar9565_1p0_modes_low_ob_db_tx_gain_table);
195 @@ -474,7 +517,10 @@ static void ar9003_tx_gain_table_mode1(s
196                         ar9462_2p1_modes_high_ob_db_tx_gain);
197         else if (AR_SREV_9462_20(ah))
198                 INIT_INI_ARRAY(&ah->iniModesTxGain,
199 -                       ar9462_modes_high_ob_db_tx_gain_table_2p0);
200 +                       ar9462_2p0_modes_high_ob_db_tx_gain);
201 +       else if (AR_SREV_9565_11(ah))
202 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
203 +                              ar9565_1p1_modes_high_ob_db_tx_gain_table);
204         else if (AR_SREV_9565(ah))
205                 INIT_INI_ARRAY(&ah->iniModesTxGain,
206                                ar9565_1p0_modes_high_ob_db_tx_gain_table);
207 @@ -500,6 +546,9 @@ static void ar9003_tx_gain_table_mode2(s
208         else if (AR_SREV_9580(ah))
209                 INIT_INI_ARRAY(&ah->iniModesTxGain,
210                         ar9580_1p0_low_ob_db_tx_gain_table);
211 +       else if (AR_SREV_9565_11(ah))
212 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
213 +                              ar9565_1p1_modes_low_ob_db_tx_gain_table);
214         else if (AR_SREV_9565(ah))
215                 INIT_INI_ARRAY(&ah->iniModesTxGain,
216                                ar9565_1p0_modes_low_ob_db_tx_gain_table);
217 @@ -525,6 +574,9 @@ static void ar9003_tx_gain_table_mode3(s
218         else if (AR_SREV_9580(ah))
219                 INIT_INI_ARRAY(&ah->iniModesTxGain,
220                         ar9580_1p0_high_power_tx_gain_table);
221 +       else if (AR_SREV_9565_11(ah))
222 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
223 +                              ar9565_1p1_modes_high_power_tx_gain_table);
224         else if (AR_SREV_9565(ah))
225                 INIT_INI_ARRAY(&ah->iniModesTxGain,
226                                ar9565_1p0_modes_high_power_tx_gain_table);
227 @@ -546,7 +598,7 @@ static void ar9003_tx_gain_table_mode4(s
228                        ar9462_2p1_modes_mix_ob_db_tx_gain);
229         else if (AR_SREV_9462_20(ah))
230                 INIT_INI_ARRAY(&ah->iniModesTxGain,
231 -                      ar9462_modes_mix_ob_db_tx_gain_table_2p0);
232 +                      ar9462_2p0_modes_mix_ob_db_tx_gain);
233         else
234                 INIT_INI_ARRAY(&ah->iniModesTxGain,
235                         ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
236 @@ -581,6 +633,13 @@ static void ar9003_tx_gain_table_mode6(s
237                         ar9580_1p0_type6_tx_gain_table);
238  }
239  
240 +static void ar9003_tx_gain_table_mode7(struct ath_hw *ah)
241 +{
242 +       if (AR_SREV_9340(ah))
243 +               INIT_INI_ARRAY(&ah->iniModesTxGain,
244 +                              ar9340_cus227_tx_gain_table_1p0);
245 +}
246 +
247  typedef void (*ath_txgain_tab)(struct ath_hw *ah);
248  
249  static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
250 @@ -593,6 +652,7 @@ static void ar9003_tx_gain_table_apply(s
251                 ar9003_tx_gain_table_mode4,
252                 ar9003_tx_gain_table_mode5,
253                 ar9003_tx_gain_table_mode6,
254 +               ar9003_tx_gain_table_mode7,
255         };
256         int idx = ar9003_hw_get_tx_gain_idx(ah);
257  
258 @@ -629,7 +689,10 @@ static void ar9003_rx_gain_table_mode0(s
259                                 ar9462_2p1_common_rx_gain);
260         else if (AR_SREV_9462_20(ah))
261                 INIT_INI_ARRAY(&ah->iniModesRxGain,
262 -                               ar9462_common_rx_gain_table_2p0);
263 +                               ar9462_2p0_common_rx_gain);
264 +       else if (AR_SREV_9565_11(ah))
265 +               INIT_INI_ARRAY(&ah->iniModesRxGain,
266 +                              ar9565_1p1_Common_rx_gain_table);
267         else if (AR_SREV_9565(ah))
268                 INIT_INI_ARRAY(&ah->iniModesRxGain,
269                                ar9565_1p0_Common_rx_gain_table);
270 @@ -657,7 +720,7 @@ static void ar9003_rx_gain_table_mode1(s
271                         ar9462_2p1_common_wo_xlna_rx_gain);
272         else if (AR_SREV_9462_20(ah))
273                 INIT_INI_ARRAY(&ah->iniModesRxGain,
274 -                       ar9462_common_wo_xlna_rx_gain_table_2p0);
275 +                       ar9462_2p0_common_wo_xlna_rx_gain);
276         else if (AR_SREV_9550(ah)) {
277                 INIT_INI_ARRAY(&ah->iniModesRxGain,
278                         ar955x_1p0_common_wo_xlna_rx_gain_table);
279 @@ -666,6 +729,9 @@ static void ar9003_rx_gain_table_mode1(s
280         } else if (AR_SREV_9580(ah))
281                 INIT_INI_ARRAY(&ah->iniModesRxGain,
282                         ar9580_1p0_wo_xlna_rx_gain_table);
283 +       else if (AR_SREV_9565_11(ah))
284 +               INIT_INI_ARRAY(&ah->iniModesRxGain,
285 +                              ar9565_1p1_common_wo_xlna_rx_gain_table);
286         else if (AR_SREV_9565(ah))
287                 INIT_INI_ARRAY(&ah->iniModesRxGain,
288                                ar9565_1p0_common_wo_xlna_rx_gain_table);
289 @@ -687,7 +753,7 @@ static void ar9003_rx_gain_table_mode2(s
290                                ar9462_2p1_baseband_postamble_5g_xlna);
291         } else if (AR_SREV_9462_20(ah)) {
292                 INIT_INI_ARRAY(&ah->iniModesRxGain,
293 -                              ar9462_common_mixed_rx_gain_table_2p0);
294 +                              ar9462_2p0_common_mixed_rx_gain);
295                 INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_core,
296                                ar9462_2p0_baseband_core_mix_rxgain);
297                 INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,
298 @@ -701,12 +767,12 @@ static void ar9003_rx_gain_table_mode3(s
299  {
300         if (AR_SREV_9462_21(ah)) {
301                 INIT_INI_ARRAY(&ah->iniModesRxGain,
302 -                              ar9462_2p1_common_5g_xlna_only_rx_gain);
303 +                              ar9462_2p1_common_5g_xlna_only_rxgain);
304                 INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
305                                ar9462_2p1_baseband_postamble_5g_xlna);
306         } else if (AR_SREV_9462_20(ah)) {
307                 INIT_INI_ARRAY(&ah->iniModesRxGain,
308 -                              ar9462_2p0_5g_xlna_only_rxgain);
309 +                              ar9462_2p0_common_5g_xlna_only_rxgain);
310                 INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
311                                ar9462_2p0_baseband_postamble_5g_xlna);
312         }
313 @@ -750,6 +816,9 @@ static void ar9003_hw_init_mode_gain_reg
314  static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
315                                          bool power_off)
316  {
317 +       unsigned int i;
318 +       struct ar5416IniArray *array;
319 +
320         /*
321          * Increase L1 Entry Latency. Some WB222 boards don't have
322          * this change in eeprom/OTP.
323 @@ -775,18 +844,13 @@ static void ar9003_hw_configpcipowersave
324          * Configire PCIE after Ini init. SERDES values now come from ini file
325          * This enables PCIe low power mode.
326          */
327 -       if (ah->config.pcieSerDesWrite) {
328 -               unsigned int i;
329 -               struct ar5416IniArray *array;
330 -
331 -               array = power_off ? &ah->iniPcieSerdes :
332 -                                   &ah->iniPcieSerdesLowPower;
333 -
334 -               for (i = 0; i < array->ia_rows; i++) {
335 -                       REG_WRITE(ah,
336 -                                 INI_RA(array, i, 0),
337 -                                 INI_RA(array, i, 1));
338 -               }
339 +       array = power_off ? &ah->iniPcieSerdes :
340 +               &ah->iniPcieSerdesLowPower;
341 +
342 +       for (i = 0; i < array->ia_rows; i++) {
343 +               REG_WRITE(ah,
344 +                         INI_RA(array, i, 0),
345 +                         INI_RA(array, i, 1));
346         }
347  }
348  
349 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
350 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
351 @@ -1447,4 +1447,106 @@ static const u32 ar9340_1p0_soc_preamble
352         {0x00007038, 0x000004c2},
353  };
354  
355 +static const u32 ar9340_cus227_tx_gain_table_1p0[][5] = {
356 +       /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
357 +       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
358 +       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
359 +       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
360 +       {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
361 +       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
362 +       {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
363 +       {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
364 +       {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
365 +       {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
366 +       {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
367 +       {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
368 +       {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
369 +       {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
370 +       {0x0000a520, 0x2c022220, 0x2c022220, 0x1b000603, 0x1b000603},
371 +       {0x0000a524, 0x30022222, 0x30022222, 0x1f000a02, 0x1f000a02},
372 +       {0x0000a528, 0x35022225, 0x35022225, 0x23000a04, 0x23000a04},
373 +       {0x0000a52c, 0x3b02222a, 0x3b02222a, 0x26000a20, 0x26000a20},
374 +       {0x0000a530, 0x3f02222c, 0x3f02222c, 0x2a000e20, 0x2a000e20},
375 +       {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
376 +       {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
377 +       {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
378 +       {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
379 +       {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
380 +       {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
381 +       {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
382 +       {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
383 +       {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
384 +       {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
385 +       {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
386 +       {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
387 +       {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
388 +       {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
389 +       {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
390 +       {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
391 +       {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
392 +       {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
393 +       {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
394 +       {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
395 +       {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
396 +       {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
397 +       {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
398 +       {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
399 +       {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
400 +       {0x0000a598, 0x21820220, 0x21820220, 0x15800402, 0x15800402},
401 +       {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
402 +       {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
403 +       {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
404 +       {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
405 +       {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
406 +       {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
407 +       {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
408 +       {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
409 +       {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
410 +       {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
411 +       {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b801861, 0x3b801861},
412 +       {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e801a81, 0x3e801a81},
413 +       {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42801a83, 0x42801a83},
414 +       {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x44801c84, 0x44801c84},
415 +       {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x48801ce3, 0x48801ce3},
416 +       {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c801ce5, 0x4c801ce5},
417 +       {0x0000a5dc, 0x7086308c, 0x7086308c, 0x50801ce9, 0x50801ce9},
418 +       {0x0000a5e0, 0x738a308a, 0x738a308a, 0x54801ceb, 0x54801ceb},
419 +       {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
420 +       {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
421 +       {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
422 +       {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
423 +       {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
424 +       {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
425 +       {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
426 +       {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
427 +       {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
428 +       {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
429 +       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
430 +       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
431 +       {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
432 +       {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
433 +       {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
434 +       {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
435 +       {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
436 +       {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
437 +       {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
438 +       {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
439 +       {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
440 +       {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
441 +       {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
442 +       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
443 +       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
444 +       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
445 +       {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
446 +       {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
447 +       {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
448 +       {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
449 +       {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
450 +       {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
451 +       {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
452 +       {0x0000a3a4, 0x00000011, 0x00000011, 0x00000011, 0x00000011},
453 +       {0x0000a3a8, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c},
454 +       {0x0000a3ac, 0x30303030, 0x30303030, 0x30303030, 0x30303030},
455 +};
456 +
457  #endif /* INITVALS_9340_H */
458 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
459 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
460 @@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc)
461  int ath_update_survey_stats(struct ath_softc *sc);
462  void ath_update_survey_nf(struct ath_softc *sc, int channel);
463  void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
464 +void ath_ps_full_sleep(unsigned long data);
465  
466  /**********/
467  /* BTCOEX */
468 @@ -570,6 +571,34 @@ static inline void ath_fill_led_pin(stru
469  }
470  #endif
471  
472 +/************************/
473 +/* Wake on Wireless LAN */
474 +/************************/
475 +
476 +#ifdef CONFIG_ATH9K_WOW
477 +void ath9k_init_wow(struct ieee80211_hw *hw);
478 +int ath9k_suspend(struct ieee80211_hw *hw,
479 +                 struct cfg80211_wowlan *wowlan);
480 +int ath9k_resume(struct ieee80211_hw *hw);
481 +void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled);
482 +#else
483 +static inline void ath9k_init_wow(struct ieee80211_hw *hw)
484 +{
485 +}
486 +static inline int ath9k_suspend(struct ieee80211_hw *hw,
487 +                               struct cfg80211_wowlan *wowlan)
488 +{
489 +       return 0;
490 +}
491 +static inline int ath9k_resume(struct ieee80211_hw *hw)
492 +{
493 +       return 0;
494 +}
495 +static inline void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
496 +{
497 +}
498 +#endif /* CONFIG_ATH9K_WOW */
499 +
500  /*******************************/
501  /* Antenna diversity/combining */
502  /*******************************/
503 @@ -632,15 +661,16 @@ void ath_ant_comb_scan(struct ath_softc 
504  /* Main driver core */
505  /********************/
506  
507 -#define ATH9K_PCI_CUS198      0x0001
508 -#define ATH9K_PCI_CUS230      0x0002
509 -#define ATH9K_PCI_CUS217      0x0004
510 -#define ATH9K_PCI_CUS252      0x0008
511 -#define ATH9K_PCI_WOW         0x0010
512 -#define ATH9K_PCI_BT_ANT_DIV  0x0020
513 -#define ATH9K_PCI_D3_L1_WAR   0x0040
514 -#define ATH9K_PCI_AR9565_1ANT 0x0080
515 -#define ATH9K_PCI_AR9565_2ANT 0x0100
516 +#define ATH9K_PCI_CUS198          0x0001
517 +#define ATH9K_PCI_CUS230          0x0002
518 +#define ATH9K_PCI_CUS217          0x0004
519 +#define ATH9K_PCI_CUS252          0x0008
520 +#define ATH9K_PCI_WOW             0x0010
521 +#define ATH9K_PCI_BT_ANT_DIV      0x0020
522 +#define ATH9K_PCI_D3_L1_WAR       0x0040
523 +#define ATH9K_PCI_AR9565_1ANT     0x0080
524 +#define ATH9K_PCI_AR9565_2ANT     0x0100
525 +#define ATH9K_PCI_NO_PLL_PWRSAVE  0x0200
526  
527  /*
528   * Default cache line size, in bytes.
529 @@ -723,6 +753,7 @@ struct ath_softc {
530         struct work_struct hw_check_work;
531         struct work_struct hw_reset_work;
532         struct completion paprd_complete;
533 +       wait_queue_head_t tx_wait;
534  
535         unsigned int hw_busy_count;
536         unsigned long sc_flags;
537 @@ -759,6 +790,7 @@ struct ath_softc {
538         struct delayed_work tx_complete_work;
539         struct delayed_work hw_pll_work;
540         struct timer_list rx_poll_timer;
541 +       struct timer_list sleep_timer;
542  
543  #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
544         struct ath_btcoex btcoex;
545 @@ -783,7 +815,7 @@ struct ath_softc {
546         bool tx99_state;
547         s16 tx99_power;
548  
549 -#ifdef CONFIG_PM_SLEEP
550 +#ifdef CONFIG_ATH9K_WOW
551         atomic_t wow_got_bmiss_intr;
552         atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
553         u32 wow_intr_before_sleep;
554 @@ -946,10 +978,25 @@ struct fft_sample_ht20_40 {
555         u8 data[SPECTRAL_HT20_40_NUM_BINS];
556  } __packed;
557  
558 -int ath9k_tx99_init(struct ath_softc *sc);
559 -void ath9k_tx99_deinit(struct ath_softc *sc);
560 +/********/
561 +/* TX99 */
562 +/********/
563 +
564 +#ifdef CONFIG_ATH9K_TX99
565 +void ath9k_tx99_init_debug(struct ath_softc *sc);
566  int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
567                     struct ath_tx_control *txctl);
568 +#else
569 +static inline void ath9k_tx99_init_debug(struct ath_softc *sc)
570 +{
571 +}
572 +static inline int ath9k_tx99_send(struct ath_softc *sc,
573 +                                 struct sk_buff *skb,
574 +                                 struct ath_tx_control *txctl)
575 +{
576 +       return 0;
577 +}
578 +#endif /* CONFIG_ATH9K_TX99 */
579  
580  void ath9k_tasklet(unsigned long data);
581  int ath_cabq_update(struct ath_softc *);
582 @@ -966,6 +1013,9 @@ extern bool is_ath9k_unloaded;
583  
584  u8 ath9k_parse_mpdudensity(u8 mpdudensity);
585  irqreturn_t ath_isr(int irq, void *dev);
586 +int ath_reset(struct ath_softc *sc);
587 +void ath_cancel_work(struct ath_softc *sc);
588 +void ath_restart_work(struct ath_softc *sc);
589  int ath9k_init_device(u16 devid, struct ath_softc *sc,
590                     const struct ath_bus_ops *bus_ops);
591  void ath9k_deinit_device(struct ath_softc *sc);
592 --- a/drivers/net/wireless/ath/ath9k/debug.c
593 +++ b/drivers/net/wireless/ath/ath9k/debug.c
594 @@ -1782,111 +1782,6 @@ void ath9k_deinit_debug(struct ath_softc
595         }
596  }
597  
598 -static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
599 -                             size_t count, loff_t *ppos)
600 -{
601 -       struct ath_softc *sc = file->private_data;
602 -       char buf[3];
603 -       unsigned int len;
604 -
605 -       len = sprintf(buf, "%d\n", sc->tx99_state);
606 -       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
607 -}
608 -
609 -static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
610 -                              size_t count, loff_t *ppos)
611 -{
612 -       struct ath_softc *sc = file->private_data;
613 -       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
614 -       char buf[32];
615 -       bool start;
616 -       ssize_t len;
617 -       int r;
618 -
619 -       if (sc->nvifs > 1)
620 -               return -EOPNOTSUPP;
621 -
622 -       len = min(count, sizeof(buf) - 1);
623 -       if (copy_from_user(buf, user_buf, len))
624 -               return -EFAULT;
625 -
626 -       if (strtobool(buf, &start))
627 -               return -EINVAL;
628 -
629 -       if (start == sc->tx99_state) {
630 -               if (!start)
631 -                       return count;
632 -               ath_dbg(common, XMIT, "Resetting TX99\n");
633 -               ath9k_tx99_deinit(sc);
634 -       }
635 -
636 -       if (!start) {
637 -               ath9k_tx99_deinit(sc);
638 -               return count;
639 -       }
640 -
641 -       r = ath9k_tx99_init(sc);
642 -       if (r)
643 -               return r;
644 -
645 -       return count;
646 -}
647 -
648 -static const struct file_operations fops_tx99 = {
649 -       .read = read_file_tx99,
650 -       .write = write_file_tx99,
651 -       .open = simple_open,
652 -       .owner = THIS_MODULE,
653 -       .llseek = default_llseek,
654 -};
655 -
656 -static ssize_t read_file_tx99_power(struct file *file,
657 -                                   char __user *user_buf,
658 -                                   size_t count, loff_t *ppos)
659 -{
660 -       struct ath_softc *sc = file->private_data;
661 -       char buf[32];
662 -       unsigned int len;
663 -
664 -       len = sprintf(buf, "%d (%d dBm)\n",
665 -                     sc->tx99_power,
666 -                     sc->tx99_power / 2);
667 -
668 -       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
669 -}
670 -
671 -static ssize_t write_file_tx99_power(struct file *file,
672 -                                    const char __user *user_buf,
673 -                                    size_t count, loff_t *ppos)
674 -{
675 -       struct ath_softc *sc = file->private_data;
676 -       int r;
677 -       u8 tx_power;
678 -
679 -       r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
680 -       if (r)
681 -               return r;
682 -
683 -       if (tx_power > MAX_RATE_POWER)
684 -               return -EINVAL;
685 -
686 -       sc->tx99_power = tx_power;
687 -
688 -       ath9k_ps_wakeup(sc);
689 -       ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
690 -       ath9k_ps_restore(sc);
691 -
692 -       return count;
693 -}
694 -
695 -static const struct file_operations fops_tx99_power = {
696 -       .read = read_file_tx99_power,
697 -       .write = write_file_tx99_power,
698 -       .open = simple_open,
699 -       .owner = THIS_MODULE,
700 -       .llseek = default_llseek,
701 -};
702 -
703  int ath9k_init_debug(struct ath_hw *ah)
704  {
705         struct ath_common *common = ath9k_hw_common(ah);
706 @@ -1903,6 +1798,7 @@ int ath9k_init_debug(struct ath_hw *ah)
707  #endif
708  
709         ath9k_dfs_init_debug(sc);
710 +       ath9k_tx99_init_debug(sc);
711  
712         debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
713                             &fops_dma);
714 @@ -1978,15 +1874,6 @@ int ath9k_init_debug(struct ath_hw *ah)
715         debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
716                             &fops_btcoex);
717  #endif
718 -       if (config_enabled(CPTCFG_ATH9K_TX99) &&
719 -           AR_SREV_9300_20_OR_LATER(ah)) {
720 -               debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
721 -                                   sc->debug.debugfs_phy, sc,
722 -                                   &fops_tx99);
723 -               debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
724 -                                   sc->debug.debugfs_phy, sc,
725 -                                   &fops_tx99_power);
726 -       }
727  
728         return 0;
729  }
730 --- a/drivers/net/wireless/ath/ath9k/hw.c
731 +++ b/drivers/net/wireless/ath/ath9k/hw.c
732 @@ -17,6 +17,7 @@
733  #include <linux/io.h>
734  #include <linux/slab.h>
735  #include <linux/module.h>
736 +#include <linux/time.h>
737  #include <asm/unaligned.h>
738  
739  #include "hw.h"
740 @@ -454,7 +455,6 @@ static void ath9k_hw_init_config(struct 
741         }
742  
743         ah->config.rx_intr_mitigation = true;
744 -       ah->config.pcieSerDesWrite = true;
745  
746         /*
747          * We need this for PCI devices only (Cardbus, PCI, miniPCI)
748 @@ -1502,8 +1502,9 @@ static bool ath9k_hw_channel_change(stru
749         int r;
750  
751         if (pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) {
752 -               band_switch = IS_CHAN_5GHZ(ah->curchan) != IS_CHAN_5GHZ(chan);
753 -               mode_diff = (chan->channelFlags != ah->curchan->channelFlags);
754 +               u32 flags_diff = chan->channelFlags ^ ah->curchan->channelFlags;
755 +               band_switch = !!(flags_diff & CHANNEL_5GHZ);
756 +               mode_diff = !!(flags_diff & ~CHANNEL_HT);
757         }
758  
759         for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
760 @@ -1815,7 +1816,7 @@ static int ath9k_hw_do_fastcc(struct ath
761          * If cross-band fcc is not supoprted, bail out if channelFlags differ.
762          */
763         if (!(pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) &&
764 -           chan->channelFlags != ah->curchan->channelFlags)
765 +           ((chan->channelFlags ^ ah->curchan->channelFlags) & ~CHANNEL_HT))
766                 goto fail;
767  
768         if (!ath9k_hw_check_alive(ah))
769 @@ -1856,10 +1857,12 @@ int ath9k_hw_reset(struct ath_hw *ah, st
770                    struct ath9k_hw_cal_data *caldata, bool fastcc)
771  {
772         struct ath_common *common = ath9k_hw_common(ah);
773 +       struct timespec ts;
774         u32 saveLedState;
775         u32 saveDefAntenna;
776         u32 macStaId1;
777         u64 tsf = 0;
778 +       s64 usec = 0;
779         int r;
780         bool start_mci_reset = false;
781         bool save_fullsleep = ah->chip_fullsleep;
782 @@ -1902,10 +1905,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
783  
784         macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
785  
786 -       /* For chips on which RTC reset is done, save TSF before it gets cleared */
787 -       if (AR_SREV_9100(ah) ||
788 -           (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)))
789 -               tsf = ath9k_hw_gettsf64(ah);
790 +       /* Save TSF before chip reset, a cold reset clears it */
791 +       tsf = ath9k_hw_gettsf64(ah);
792 +       getrawmonotonic(&ts);
793 +       usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000;
794  
795         saveLedState = REG_READ(ah, AR_CFG_LED) &
796                 (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
797 @@ -1938,8 +1941,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
798         }
799  
800         /* Restore TSF */
801 -       if (tsf)
802 -               ath9k_hw_settsf64(ah, tsf);
803 +       getrawmonotonic(&ts);
804 +       usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec;
805 +       ath9k_hw_settsf64(ah, tsf + usec);
806  
807         if (AR_SREV_9280_20_OR_LATER(ah))
808                 REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
809 --- a/drivers/net/wireless/ath/ath9k/hw.h
810 +++ b/drivers/net/wireless/ath/ath9k/hw.h
811 @@ -283,7 +283,6 @@ struct ath9k_ops_config {
812         int additional_swba_backoff;
813         int ack_6mb;
814         u32 cwm_ignore_extcca;
815 -       bool pcieSerDesWrite;
816         u8 pcie_clock_req;
817         u32 pcie_waen;
818         u8 analog_shiftreg;
819 @@ -316,6 +315,7 @@ struct ath9k_ops_config {
820         u32 ant_ctrl_comm2g_switch_enable;
821         bool xatten_margin_cfg;
822         bool alt_mingainidx;
823 +       bool no_pll_pwrsave;
824  };
825  
826  enum ath9k_int {
827 @@ -920,7 +920,7 @@ struct ath_hw {
828         /* Enterprise mode cap */
829         u32 ent_mode;
830  
831 -#ifdef CONFIG_PM_SLEEP
832 +#ifdef CONFIG_ATH9K_WOW
833         u32 wow_event_mask;
834  #endif
835         bool is_clk_25mhz;
836 @@ -1126,7 +1126,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw
837  #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
838  
839  
840 -#ifdef CONFIG_PM_SLEEP
841 +#ifdef CONFIG_ATH9K_WOW
842  const char *ath9k_hw_wow_event_to_string(u32 wow_event);
843  void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
844                                 u8 *user_mask, int pattern_count,
845 --- a/drivers/net/wireless/ath/ath9k/init.c
846 +++ b/drivers/net/wireless/ath/ath9k/init.c
847 @@ -609,6 +609,11 @@ static void ath9k_init_platform(struct a
848                 ah->config.pcie_waen = 0x0040473b;
849                 ath_info(common, "Enable WAR for ASPM D3/L1\n");
850         }
851 +
852 +       if (sc->driver_data & ATH9K_PCI_NO_PLL_PWRSAVE) {
853 +               ah->config.no_pll_pwrsave = true;
854 +               ath_info(common, "Disable PLL PowerSave\n");
855 +       }
856  }
857  
858  static void ath9k_eeprom_request_cb(const struct firmware *eeprom_blob,
859 @@ -683,6 +688,7 @@ static int ath9k_init_softc(u16 devid, s
860         common = ath9k_hw_common(ah);
861         sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
862         sc->tx99_power = MAX_RATE_POWER + 1;
863 +       init_waitqueue_head(&sc->tx_wait);
864  
865         if (!pdata) {
866                 ah->ah_flags |= AH_USE_EEPROM;
867 @@ -730,6 +736,7 @@ static int ath9k_init_softc(u16 devid, s
868         tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
869                      (unsigned long)sc);
870  
871 +       setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
872         INIT_WORK(&sc->hw_reset_work, ath_reset_work);
873         INIT_WORK(&sc->hw_check_work, ath_hw_check);
874         INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
875 @@ -845,7 +852,8 @@ static const struct ieee80211_iface_limi
876  };
877  
878  static const struct ieee80211_iface_limit if_dfs_limits[] = {
879 -       { .max = 1,     .types = BIT(NL80211_IFTYPE_AP) },
880 +       { .max = 1,     .types = BIT(NL80211_IFTYPE_AP) |
881 +                                BIT(NL80211_IFTYPE_ADHOC) },
882  };
883  
884  static const struct ieee80211_iface_combination if_comb[] = {
885 @@ -862,20 +870,11 @@ static const struct ieee80211_iface_comb
886                 .max_interfaces = 1,
887                 .num_different_channels = 1,
888                 .beacon_int_infra_match = true,
889 -               .radar_detect_widths =  BIT(NL80211_CHAN_NO_HT) |
890 -                                       BIT(NL80211_CHAN_HT20),
891 +               .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
892 +                                       BIT(NL80211_CHAN_WIDTH_20),
893         }
894  };
895  
896 -#ifdef CONFIG_PM
897 -static const struct wiphy_wowlan_support ath9k_wowlan_support = {
898 -       .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
899 -       .n_patterns = MAX_NUM_USER_PATTERN,
900 -       .pattern_min_len = 1,
901 -       .pattern_max_len = MAX_PATTERN_SIZE,
902 -};
903 -#endif
904 -
905  void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
906  {
907         struct ath_hw *ah = sc->sc_ah;
908 @@ -925,16 +924,6 @@ void ath9k_set_hw_capab(struct ath_softc
909         hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
910         hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
911  
912 -#ifdef CONFIG_PM_SLEEP
913 -       if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
914 -           (sc->driver_data & ATH9K_PCI_WOW) &&
915 -           device_can_wakeup(sc->dev))
916 -               hw->wiphy->wowlan = &ath9k_wowlan_support;
917 -
918 -       atomic_set(&sc->wow_sleep_proc_intr, -1);
919 -       atomic_set(&sc->wow_got_bmiss_intr, -1);
920 -#endif
921 -
922         hw->queues = 4;
923         hw->max_rates = 4;
924         hw->channel_change_time = 5000;
925 @@ -960,6 +949,7 @@ void ath9k_set_hw_capab(struct ath_softc
926                 hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
927                         &sc->sbands[IEEE80211_BAND_5GHZ];
928  
929 +       ath9k_init_wow(hw);
930         ath9k_reload_chainmask_settings(sc);
931  
932         SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
933 @@ -1058,6 +1048,7 @@ static void ath9k_deinit_softc(struct at
934                 if (ATH_TXQ_SETUP(sc, i))
935                         ath_tx_cleanupq(sc, &sc->tx.txq[i]);
936  
937 +       del_timer_sync(&sc->sleep_timer);
938         ath9k_hw_deinit(sc->sc_ah);
939         if (sc->dfs_detector != NULL)
940                 sc->dfs_detector->exit(sc->dfs_detector);
941 --- a/drivers/net/wireless/ath/ath9k/main.c
942 +++ b/drivers/net/wireless/ath/ath9k/main.c
943 @@ -82,6 +82,22 @@ static bool ath9k_setpower(struct ath_so
944         return ret;
945  }
946  
947 +void ath_ps_full_sleep(unsigned long data)
948 +{
949 +       struct ath_softc *sc = (struct ath_softc *) data;
950 +       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
951 +       bool reset;
952 +
953 +       spin_lock(&common->cc_lock);
954 +       ath_hw_cycle_counters_update(common);
955 +       spin_unlock(&common->cc_lock);
956 +
957 +       ath9k_hw_setrxabort(sc->sc_ah, 1);
958 +       ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
959 +
960 +       ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
961 +}
962 +
963  void ath9k_ps_wakeup(struct ath_softc *sc)
964  {
965         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
966 @@ -92,6 +108,7 @@ void ath9k_ps_wakeup(struct ath_softc *s
967         if (++sc->ps_usecount != 1)
968                 goto unlock;
969  
970 +       del_timer_sync(&sc->sleep_timer);
971         power_mode = sc->sc_ah->power_mode;
972         ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
973  
974 @@ -117,17 +134,17 @@ void ath9k_ps_restore(struct ath_softc *
975         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
976         enum ath9k_power_mode mode;
977         unsigned long flags;
978 -       bool reset;
979  
980         spin_lock_irqsave(&sc->sc_pm_lock, flags);
981         if (--sc->ps_usecount != 0)
982                 goto unlock;
983  
984         if (sc->ps_idle) {
985 -               ath9k_hw_setrxabort(sc->sc_ah, 1);
986 -               ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
987 -               mode = ATH9K_PM_FULL_SLEEP;
988 -       } else if (sc->ps_enabled &&
989 +               mod_timer(&sc->sleep_timer, jiffies + HZ / 10);
990 +               goto unlock;
991 +       }
992 +
993 +       if (sc->ps_enabled &&
994                    !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
995                                      PS_WAIT_FOR_CAB |
996                                      PS_WAIT_FOR_PSPOLL_DATA |
997 @@ -163,13 +180,13 @@ static void __ath_cancel_work(struct ath
998  #endif
999  }
1000  
1001 -static void ath_cancel_work(struct ath_softc *sc)
1002 +void ath_cancel_work(struct ath_softc *sc)
1003  {
1004         __ath_cancel_work(sc);
1005         cancel_work_sync(&sc->hw_reset_work);
1006  }
1007  
1008 -static void ath_restart_work(struct ath_softc *sc)
1009 +void ath_restart_work(struct ath_softc *sc)
1010  {
1011         ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
1012  
1013 @@ -487,6 +504,8 @@ void ath9k_tasklet(unsigned long data)
1014                         ath_tx_edma_tasklet(sc);
1015                 else
1016                         ath_tx_tasklet(sc);
1017 +
1018 +               wake_up(&sc->tx_wait);
1019         }
1020  
1021         ath9k_btcoex_handle_interrupt(sc, status);
1022 @@ -579,7 +598,8 @@ irqreturn_t ath_isr(int irq, void *dev)
1023  
1024                 goto chip_reset;
1025         }
1026 -#ifdef CONFIG_PM_SLEEP
1027 +
1028 +#ifdef CONFIG_ATH9K_WOW
1029         if (status & ATH9K_INT_BMISS) {
1030                 if (atomic_read(&sc->wow_sleep_proc_intr) == 0) {
1031                         ath_dbg(common, ANY, "during WoW we got a BMISS\n");
1032 @@ -588,6 +608,8 @@ irqreturn_t ath_isr(int irq, void *dev)
1033                 }
1034         }
1035  #endif
1036 +
1037 +
1038         if (status & ATH9K_INT_SWBA)
1039                 tasklet_schedule(&sc->bcon_tasklet);
1040  
1041 @@ -627,7 +649,7 @@ chip_reset:
1042  #undef SCHED_INTR
1043  }
1044  
1045 -static int ath_reset(struct ath_softc *sc)
1046 +int ath_reset(struct ath_softc *sc)
1047  {
1048         int r;
1049  
1050 @@ -1817,13 +1839,31 @@ static void ath9k_set_coverage_class(str
1051         mutex_unlock(&sc->mutex);
1052  }
1053  
1054 +static bool ath9k_has_tx_pending(struct ath_softc *sc)
1055 +{
1056 +       int i, npend;
1057 +
1058 +       for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1059 +               if (!ATH_TXQ_SETUP(sc, i))
1060 +                       continue;
1061 +
1062 +               if (!sc->tx.txq[i].axq_depth)
1063 +                       continue;
1064 +
1065 +               npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
1066 +               if (npend)
1067 +                       break;
1068 +       }
1069 +
1070 +       return !!npend;
1071 +}
1072 +
1073  static void ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
1074  {
1075         struct ath_softc *sc = hw->priv;
1076         struct ath_hw *ah = sc->sc_ah;
1077         struct ath_common *common = ath9k_hw_common(ah);
1078 -       int timeout = 200; /* ms */
1079 -       int i, j;
1080 +       int timeout = HZ / 5; /* 200 ms */
1081         bool drain_txq;
1082  
1083         mutex_lock(&sc->mutex);
1084 @@ -1841,25 +1881,9 @@ static void ath9k_flush(struct ieee80211
1085                 return;
1086         }
1087  
1088 -       for (j = 0; j < timeout; j++) {
1089 -               bool npend = false;
1090 -
1091 -               if (j)
1092 -                       usleep_range(1000, 2000);
1093 -
1094 -               for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1095 -                       if (!ATH_TXQ_SETUP(sc, i))
1096 -                               continue;
1097 -
1098 -                       npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
1099 -
1100 -                       if (npend)
1101 -                               break;
1102 -               }
1103 -
1104 -               if (!npend)
1105 -                   break;
1106 -       }
1107 +       if (wait_event_timeout(sc->tx_wait, !ath9k_has_tx_pending(sc),
1108 +                              timeout) > 0)
1109 +               drop = false;
1110  
1111         if (drop) {
1112                 ath9k_ps_wakeup(sc);
1113 @@ -2021,333 +2045,6 @@ static int ath9k_get_antenna(struct ieee
1114         return 0;
1115  }
1116  
1117 -#ifdef CONFIG_PM_SLEEP
1118 -
1119 -static void ath9k_wow_map_triggers(struct ath_softc *sc,
1120 -                                  struct cfg80211_wowlan *wowlan,
1121 -                                  u32 *wow_triggers)
1122 -{
1123 -       if (wowlan->disconnect)
1124 -               *wow_triggers |= AH_WOW_LINK_CHANGE |
1125 -                                AH_WOW_BEACON_MISS;
1126 -       if (wowlan->magic_pkt)
1127 -               *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
1128 -
1129 -       if (wowlan->n_patterns)
1130 -               *wow_triggers |= AH_WOW_USER_PATTERN_EN;
1131 -
1132 -       sc->wow_enabled = *wow_triggers;
1133 -
1134 -}
1135 -
1136 -static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
1137 -{
1138 -       struct ath_hw *ah = sc->sc_ah;
1139 -       struct ath_common *common = ath9k_hw_common(ah);
1140 -       int pattern_count = 0;
1141 -       int i, byte_cnt;
1142 -       u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
1143 -       u8 dis_deauth_mask[MAX_PATTERN_SIZE];
1144 -
1145 -       memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
1146 -       memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
1147 -
1148 -       /*
1149 -        * Create Dissassociate / Deauthenticate packet filter
1150 -        *
1151 -        *     2 bytes        2 byte    6 bytes   6 bytes  6 bytes
1152 -        *  +--------------+----------+---------+--------+--------+----
1153 -        *  + Frame Control+ Duration +   DA    +  SA    +  BSSID +
1154 -        *  +--------------+----------+---------+--------+--------+----
1155 -        *
1156 -        * The above is the management frame format for disassociate/
1157 -        * deauthenticate pattern, from this we need to match the first byte
1158 -        * of 'Frame Control' and DA, SA, and BSSID fields
1159 -        * (skipping 2nd byte of FC and Duration feild.
1160 -        *
1161 -        * Disassociate pattern
1162 -        * --------------------
1163 -        * Frame control = 00 00 1010
1164 -        * DA, SA, BSSID = x:x:x:x:x:x
1165 -        * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
1166 -        *                          | x:x:x:x:x:x  -- 22 bytes
1167 -        *
1168 -        * Deauthenticate pattern
1169 -        * ----------------------
1170 -        * Frame control = 00 00 1100
1171 -        * DA, SA, BSSID = x:x:x:x:x:x
1172 -        * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
1173 -        *                          | x:x:x:x:x:x  -- 22 bytes
1174 -        */
1175 -
1176 -       /* Create Disassociate Pattern first */
1177 -
1178 -       byte_cnt = 0;
1179 -
1180 -       /* Fill out the mask with all FF's */
1181 -
1182 -       for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
1183 -               dis_deauth_mask[i] = 0xff;
1184 -
1185 -       /* copy the first byte of frame control field */
1186 -       dis_deauth_pattern[byte_cnt] = 0xa0;
1187 -       byte_cnt++;
1188 -
1189 -       /* skip 2nd byte of frame control and Duration field */
1190 -       byte_cnt += 3;
1191 -
1192 -       /*
1193 -        * need not match the destination mac address, it can be a broadcast
1194 -        * mac address or an unicast to this station
1195 -        */
1196 -       byte_cnt += 6;
1197 -
1198 -       /* copy the source mac address */
1199 -       memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
1200 -
1201 -       byte_cnt += 6;
1202 -
1203 -       /* copy the bssid, its same as the source mac address */
1204 -
1205 -       memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
1206 -
1207 -       /* Create Disassociate pattern mask */
1208 -
1209 -       dis_deauth_mask[0] = 0xfe;
1210 -       dis_deauth_mask[1] = 0x03;
1211 -       dis_deauth_mask[2] = 0xc0;
1212 -
1213 -       ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
1214 -
1215 -       ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
1216 -                                  pattern_count, byte_cnt);
1217 -
1218 -       pattern_count++;
1219 -       /*
1220 -        * for de-authenticate pattern, only the first byte of the frame
1221 -        * control field gets changed from 0xA0 to 0xC0
1222 -        */
1223 -       dis_deauth_pattern[0] = 0xC0;
1224 -
1225 -       ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
1226 -                                  pattern_count, byte_cnt);
1227 -
1228 -}
1229 -
1230 -static void ath9k_wow_add_pattern(struct ath_softc *sc,
1231 -                                 struct cfg80211_wowlan *wowlan)
1232 -{
1233 -       struct ath_hw *ah = sc->sc_ah;
1234 -       struct ath9k_wow_pattern *wow_pattern = NULL;
1235 -       struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
1236 -       int mask_len;
1237 -       s8 i = 0;
1238 -
1239 -       if (!wowlan->n_patterns)
1240 -               return;
1241 -
1242 -       /*
1243 -        * Add the new user configured patterns
1244 -        */
1245 -       for (i = 0; i < wowlan->n_patterns; i++) {
1246 -
1247 -               wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
1248 -
1249 -               if (!wow_pattern)
1250 -                       return;
1251 -
1252 -               /*
1253 -                * TODO: convert the generic user space pattern to
1254 -                * appropriate chip specific/802.11 pattern.
1255 -                */
1256 -
1257 -               mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
1258 -               memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
1259 -               memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
1260 -               memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
1261 -                      patterns[i].pattern_len);
1262 -               memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
1263 -               wow_pattern->pattern_len = patterns[i].pattern_len;
1264 -
1265 -               /*
1266 -                * just need to take care of deauth and disssoc pattern,
1267 -                * make sure we don't overwrite them.
1268 -                */
1269 -
1270 -               ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
1271 -                                          wow_pattern->mask_bytes,
1272 -                                          i + 2,
1273 -                                          wow_pattern->pattern_len);
1274 -               kfree(wow_pattern);
1275 -
1276 -       }
1277 -
1278 -}
1279 -
1280 -static int ath9k_suspend(struct ieee80211_hw *hw,
1281 -                        struct cfg80211_wowlan *wowlan)
1282 -{
1283 -       struct ath_softc *sc = hw->priv;
1284 -       struct ath_hw *ah = sc->sc_ah;
1285 -       struct ath_common *common = ath9k_hw_common(ah);
1286 -       u32 wow_triggers_enabled = 0;
1287 -       int ret = 0;
1288 -
1289 -       mutex_lock(&sc->mutex);
1290 -
1291 -       ath_cancel_work(sc);
1292 -       ath_stop_ani(sc);
1293 -       del_timer_sync(&sc->rx_poll_timer);
1294 -
1295 -       if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
1296 -               ath_dbg(common, ANY, "Device not present\n");
1297 -               ret = -EINVAL;
1298 -               goto fail_wow;
1299 -       }
1300 -
1301 -       if (WARN_ON(!wowlan)) {
1302 -               ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
1303 -               ret = -EINVAL;
1304 -               goto fail_wow;
1305 -       }
1306 -
1307 -       if (!device_can_wakeup(sc->dev)) {
1308 -               ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
1309 -               ret = 1;
1310 -               goto fail_wow;
1311 -       }
1312 -
1313 -       /*
1314 -        * none of the sta vifs are associated
1315 -        * and we are not currently handling multivif
1316 -        * cases, for instance we have to seperately
1317 -        * configure 'keep alive frame' for each
1318 -        * STA.
1319 -        */
1320 -
1321 -       if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
1322 -               ath_dbg(common, WOW, "None of the STA vifs are associated\n");
1323 -               ret = 1;
1324 -               goto fail_wow;
1325 -       }
1326 -
1327 -       if (sc->nvifs > 1) {
1328 -               ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
1329 -               ret = 1;
1330 -               goto fail_wow;
1331 -       }
1332 -
1333 -       ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
1334 -
1335 -       ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
1336 -               wow_triggers_enabled);
1337 -
1338 -       ath9k_ps_wakeup(sc);
1339 -
1340 -       ath9k_stop_btcoex(sc);
1341 -
1342 -       /*
1343 -        * Enable wake up on recieving disassoc/deauth
1344 -        * frame by default.
1345 -        */
1346 -       ath9k_wow_add_disassoc_deauth_pattern(sc);
1347 -
1348 -       if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
1349 -               ath9k_wow_add_pattern(sc, wowlan);
1350 -
1351 -       spin_lock_bh(&sc->sc_pcu_lock);
1352 -       /*
1353 -        * To avoid false wake, we enable beacon miss interrupt only
1354 -        * when we go to sleep. We save the current interrupt mask
1355 -        * so we can restore it after the system wakes up
1356 -        */
1357 -       sc->wow_intr_before_sleep = ah->imask;
1358 -       ah->imask &= ~ATH9K_INT_GLOBAL;
1359 -       ath9k_hw_disable_interrupts(ah);
1360 -       ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
1361 -       ath9k_hw_set_interrupts(ah);
1362 -       ath9k_hw_enable_interrupts(ah);
1363 -
1364 -       spin_unlock_bh(&sc->sc_pcu_lock);
1365 -
1366 -       /*
1367 -        * we can now sync irq and kill any running tasklets, since we already
1368 -        * disabled interrupts and not holding a spin lock
1369 -        */
1370 -       synchronize_irq(sc->irq);
1371 -       tasklet_kill(&sc->intr_tq);
1372 -
1373 -       ath9k_hw_wow_enable(ah, wow_triggers_enabled);
1374 -
1375 -       ath9k_ps_restore(sc);
1376 -       ath_dbg(common, ANY, "WoW enabled in ath9k\n");
1377 -       atomic_inc(&sc->wow_sleep_proc_intr);
1378 -
1379 -fail_wow:
1380 -       mutex_unlock(&sc->mutex);
1381 -       return ret;
1382 -}
1383 -
1384 -static int ath9k_resume(struct ieee80211_hw *hw)
1385 -{
1386 -       struct ath_softc *sc = hw->priv;
1387 -       struct ath_hw *ah = sc->sc_ah;
1388 -       struct ath_common *common = ath9k_hw_common(ah);
1389 -       u32 wow_status;
1390 -
1391 -       mutex_lock(&sc->mutex);
1392 -
1393 -       ath9k_ps_wakeup(sc);
1394 -
1395 -       spin_lock_bh(&sc->sc_pcu_lock);
1396 -
1397 -       ath9k_hw_disable_interrupts(ah);
1398 -       ah->imask = sc->wow_intr_before_sleep;
1399 -       ath9k_hw_set_interrupts(ah);
1400 -       ath9k_hw_enable_interrupts(ah);
1401 -
1402 -       spin_unlock_bh(&sc->sc_pcu_lock);
1403 -
1404 -       wow_status = ath9k_hw_wow_wakeup(ah);
1405 -
1406 -       if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
1407 -               /*
1408 -                * some devices may not pick beacon miss
1409 -                * as the reason they woke up so we add
1410 -                * that here for that shortcoming.
1411 -                */
1412 -               wow_status |= AH_WOW_BEACON_MISS;
1413 -               atomic_dec(&sc->wow_got_bmiss_intr);
1414 -               ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
1415 -       }
1416 -
1417 -       atomic_dec(&sc->wow_sleep_proc_intr);
1418 -
1419 -       if (wow_status) {
1420 -               ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
1421 -                       ath9k_hw_wow_event_to_string(wow_status), wow_status);
1422 -       }
1423 -
1424 -       ath_restart_work(sc);
1425 -       ath9k_start_btcoex(sc);
1426 -
1427 -       ath9k_ps_restore(sc);
1428 -       mutex_unlock(&sc->mutex);
1429 -
1430 -       return 0;
1431 -}
1432 -
1433 -static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
1434 -{
1435 -       struct ath_softc *sc = hw->priv;
1436 -
1437 -       mutex_lock(&sc->mutex);
1438 -       device_init_wakeup(sc->dev, 1);
1439 -       device_set_wakeup_enable(sc->dev, enabled);
1440 -       mutex_unlock(&sc->mutex);
1441 -}
1442 -
1443 -#endif
1444  static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
1445  {
1446         struct ath_softc *sc = hw->priv;
1447 @@ -2373,134 +2070,6 @@ static void ath9k_channel_switch_beacon(
1448         sc->csa_vif = vif;
1449  }
1450  
1451 -static void ath9k_tx99_stop(struct ath_softc *sc)
1452 -{
1453 -       struct ath_hw *ah = sc->sc_ah;
1454 -       struct ath_common *common = ath9k_hw_common(ah);
1455 -
1456 -       ath_drain_all_txq(sc);
1457 -       ath_startrecv(sc);
1458 -
1459 -       ath9k_hw_set_interrupts(ah);
1460 -       ath9k_hw_enable_interrupts(ah);
1461 -
1462 -       ieee80211_wake_queues(sc->hw);
1463 -
1464 -       kfree_skb(sc->tx99_skb);
1465 -       sc->tx99_skb = NULL;
1466 -       sc->tx99_state = false;
1467 -
1468 -       ath9k_hw_tx99_stop(sc->sc_ah);
1469 -       ath_dbg(common, XMIT, "TX99 stopped\n");
1470 -}
1471 -
1472 -static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
1473 -{
1474 -       static u8 PN9Data[] = {0xff, 0x87, 0xb8, 0x59, 0xb7, 0xa1, 0xcc, 0x24,
1475 -                              0x57, 0x5e, 0x4b, 0x9c, 0x0e, 0xe9, 0xea, 0x50,
1476 -                              0x2a, 0xbe, 0xb4, 0x1b, 0xb6, 0xb0, 0x5d, 0xf1,
1477 -                              0xe6, 0x9a, 0xe3, 0x45, 0xfd, 0x2c, 0x53, 0x18,
1478 -                              0x0c, 0xca, 0xc9, 0xfb, 0x49, 0x37, 0xe5, 0xa8,
1479 -                              0x51, 0x3b, 0x2f, 0x61, 0xaa, 0x72, 0x18, 0x84,
1480 -                              0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
1481 -                              0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
1482 -       u32 len = 1200;
1483 -       struct ieee80211_hw *hw = sc->hw;
1484 -       struct ieee80211_hdr *hdr;
1485 -       struct ieee80211_tx_info *tx_info;
1486 -       struct sk_buff *skb;
1487 -
1488 -       skb = alloc_skb(len, GFP_KERNEL);
1489 -       if (!skb)
1490 -               return NULL;
1491 -
1492 -       skb_put(skb, len);
1493 -
1494 -       memset(skb->data, 0, len);
1495 -
1496 -       hdr = (struct ieee80211_hdr *)skb->data;
1497 -       hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA);
1498 -       hdr->duration_id = 0;
1499 -
1500 -       memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
1501 -       memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
1502 -       memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
1503 -
1504 -       hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
1505 -
1506 -       tx_info = IEEE80211_SKB_CB(skb);
1507 -       memset(tx_info, 0, sizeof(*tx_info));
1508 -       tx_info->band = hw->conf.chandef.chan->band;
1509 -       tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
1510 -       tx_info->control.vif = sc->tx99_vif;
1511 -
1512 -       memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));
1513 -
1514 -       return skb;
1515 -}
1516 -
1517 -void ath9k_tx99_deinit(struct ath_softc *sc)
1518 -{
1519 -       ath_reset(sc);
1520 -
1521 -       ath9k_ps_wakeup(sc);
1522 -       ath9k_tx99_stop(sc);
1523 -       ath9k_ps_restore(sc);
1524 -}
1525 -
1526 -int ath9k_tx99_init(struct ath_softc *sc)
1527 -{
1528 -       struct ieee80211_hw *hw = sc->hw;
1529 -       struct ath_hw *ah = sc->sc_ah;
1530 -       struct ath_common *common = ath9k_hw_common(ah);
1531 -       struct ath_tx_control txctl;
1532 -       int r;
1533 -
1534 -       if (sc->sc_flags & SC_OP_INVALID) {
1535 -               ath_err(common,
1536 -                       "driver is in invalid state unable to use TX99");
1537 -               return -EINVAL;
1538 -       }
1539 -
1540 -       sc->tx99_skb = ath9k_build_tx99_skb(sc);
1541 -       if (!sc->tx99_skb)
1542 -               return -ENOMEM;
1543 -
1544 -       memset(&txctl, 0, sizeof(txctl));
1545 -       txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
1546 -
1547 -       ath_reset(sc);
1548 -
1549 -       ath9k_ps_wakeup(sc);
1550 -
1551 -       ath9k_hw_disable_interrupts(ah);
1552 -       atomic_set(&ah->intr_ref_cnt, -1);
1553 -       ath_drain_all_txq(sc);
1554 -       ath_stoprecv(sc);
1555 -
1556 -       sc->tx99_state = true;
1557 -
1558 -       ieee80211_stop_queues(hw);
1559 -
1560 -       if (sc->tx99_power == MAX_RATE_POWER + 1)
1561 -               sc->tx99_power = MAX_RATE_POWER;
1562 -
1563 -       ath9k_hw_tx99_set_txpower(ah, sc->tx99_power);
1564 -       r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
1565 -       if (r) {
1566 -               ath_dbg(common, XMIT, "Failed to xmit TX99 skb\n");
1567 -               return r;
1568 -       }
1569 -
1570 -       ath_dbg(common, XMIT, "TX99 xmit started using %d ( %ddBm)\n",
1571 -               sc->tx99_power,
1572 -               sc->tx99_power / 2);
1573 -
1574 -       /* We leave the harware awake as it will be chugging on */
1575 -
1576 -       return 0;
1577 -}
1578 -
1579  struct ieee80211_ops ath9k_ops = {
1580         .tx                 = ath9k_tx,
1581         .start              = ath9k_start,
1582 @@ -2531,7 +2100,7 @@ struct ieee80211_ops ath9k_ops = {
1583         .set_antenna        = ath9k_set_antenna,
1584         .get_antenna        = ath9k_get_antenna,
1585  
1586 -#ifdef CONFIG_PM_SLEEP
1587 +#ifdef CONFIG_ATH9K_WOW
1588         .suspend            = ath9k_suspend,
1589         .resume             = ath9k_resume,
1590         .set_wakeup         = ath9k_set_wakeup,
1591 --- a/drivers/net/wireless/ath/ath9k/wow.c
1592 +++ b/drivers/net/wireless/ath/ath9k/wow.c
1593 @@ -1,5 +1,5 @@
1594  /*
1595 - * Copyright (c) 2012 Qualcomm Atheros, Inc.
1596 + * Copyright (c) 2013 Qualcomm Atheros, Inc.
1597   *
1598   * Permission to use, copy, modify, and/or distribute this software for any
1599   * purpose with or without fee is hereby granted, provided that the above
1600 @@ -14,409 +14,348 @@
1601   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1602   */
1603  
1604 -#include <linux/export.h>
1605  #include "ath9k.h"
1606 -#include "reg.h"
1607 -#include "hw-ops.h"
1608  
1609 -const char *ath9k_hw_wow_event_to_string(u32 wow_event)
1610 +static const struct wiphy_wowlan_support ath9k_wowlan_support = {
1611 +       .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
1612 +       .n_patterns = MAX_NUM_USER_PATTERN,
1613 +       .pattern_min_len = 1,
1614 +       .pattern_max_len = MAX_PATTERN_SIZE,
1615 +};
1616 +
1617 +static void ath9k_wow_map_triggers(struct ath_softc *sc,
1618 +                                  struct cfg80211_wowlan *wowlan,
1619 +                                  u32 *wow_triggers)
1620  {
1621 -       if (wow_event & AH_WOW_MAGIC_PATTERN_EN)
1622 -               return "Magic pattern";
1623 -       if (wow_event & AH_WOW_USER_PATTERN_EN)
1624 -               return "User pattern";
1625 -       if (wow_event & AH_WOW_LINK_CHANGE)
1626 -               return "Link change";
1627 -       if (wow_event & AH_WOW_BEACON_MISS)
1628 -               return "Beacon miss";
1629 +       if (wowlan->disconnect)
1630 +               *wow_triggers |= AH_WOW_LINK_CHANGE |
1631 +                                AH_WOW_BEACON_MISS;
1632 +       if (wowlan->magic_pkt)
1633 +               *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
1634 +
1635 +       if (wowlan->n_patterns)
1636 +               *wow_triggers |= AH_WOW_USER_PATTERN_EN;
1637 +
1638 +       sc->wow_enabled = *wow_triggers;
1639  
1640 -       return  "unknown reason";
1641  }
1642 -EXPORT_SYMBOL(ath9k_hw_wow_event_to_string);
1643  
1644 -static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
1645 +static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
1646  {
1647 +       struct ath_hw *ah = sc->sc_ah;
1648         struct ath_common *common = ath9k_hw_common(ah);
1649 +       int pattern_count = 0;
1650 +       int i, byte_cnt;
1651 +       u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
1652 +       u8 dis_deauth_mask[MAX_PATTERN_SIZE];
1653  
1654 -       REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
1655 +       memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
1656 +       memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
1657  
1658 -       /* set rx disable bit */
1659 -       REG_WRITE(ah, AR_CR, AR_CR_RXD);
1660 +       /*
1661 +        * Create Dissassociate / Deauthenticate packet filter
1662 +        *
1663 +        *     2 bytes        2 byte    6 bytes   6 bytes  6 bytes
1664 +        *  +--------------+----------+---------+--------+--------+----
1665 +        *  + Frame Control+ Duration +   DA    +  SA    +  BSSID +
1666 +        *  +--------------+----------+---------+--------+--------+----
1667 +        *
1668 +        * The above is the management frame format for disassociate/
1669 +        * deauthenticate pattern, from this we need to match the first byte
1670 +        * of 'Frame Control' and DA, SA, and BSSID fields
1671 +        * (skipping 2nd byte of FC and Duration feild.
1672 +        *
1673 +        * Disassociate pattern
1674 +        * --------------------
1675 +        * Frame control = 00 00 1010
1676 +        * DA, SA, BSSID = x:x:x:x:x:x
1677 +        * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
1678 +        *                          | x:x:x:x:x:x  -- 22 bytes
1679 +        *
1680 +        * Deauthenticate pattern
1681 +        * ----------------------
1682 +        * Frame control = 00 00 1100
1683 +        * DA, SA, BSSID = x:x:x:x:x:x
1684 +        * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
1685 +        *                          | x:x:x:x:x:x  -- 22 bytes
1686 +        */
1687  
1688 -       if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {
1689 -               ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
1690 -                       REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));
1691 -               return;
1692 -       }
1693 +       /* Create Disassociate Pattern first */
1694  
1695 -       REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
1696 -}
1697 +       byte_cnt = 0;
1698  
1699 -static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
1700 -{
1701 -       struct ath_common *common = ath9k_hw_common(ah);
1702 -       u8 sta_mac_addr[ETH_ALEN], ap_mac_addr[ETH_ALEN];
1703 -       u32 ctl[13] = {0};
1704 -       u32 data_word[KAL_NUM_DATA_WORDS];
1705 -       u8 i;
1706 -       u32 wow_ka_data_word0;
1707 -
1708 -       memcpy(sta_mac_addr, common->macaddr, ETH_ALEN);
1709 -       memcpy(ap_mac_addr, common->curbssid, ETH_ALEN);
1710 -
1711 -       /* set the transmit buffer */
1712 -       ctl[0] = (KAL_FRAME_LEN | (MAX_RATE_POWER << 16));
1713 -       ctl[1] = 0;
1714 -       ctl[3] = 0xb;   /* OFDM_6M hardware value for this rate */
1715 -       ctl[4] = 0;
1716 -       ctl[7] = (ah->txchainmask) << 2;
1717 -       ctl[2] = 0xf << 16; /* tx_tries 0 */
1718 -
1719 -       for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
1720 -               REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
1721 -
1722 -       REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
1723 -
1724 -       data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
1725 -                      (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
1726 -       data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
1727 -                      (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
1728 -       data_word[2] = (sta_mac_addr[1] << 24) | (sta_mac_addr[0] << 16) |
1729 -                      (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
1730 -       data_word[3] = (sta_mac_addr[5] << 24) | (sta_mac_addr[4] << 16) |
1731 -                      (sta_mac_addr[3] << 8) | (sta_mac_addr[2]);
1732 -       data_word[4] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
1733 -                      (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
1734 -       data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
1735 -
1736 -       if (AR_SREV_9462_20(ah)) {
1737 -               /* AR9462 2.0 has an extra descriptor word (time based
1738 -                * discard) compared to other chips */
1739 -               REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
1740 -               wow_ka_data_word0 = AR_WOW_TXBUF(13);
1741 -       } else {
1742 -               wow_ka_data_word0 = AR_WOW_TXBUF(12);
1743 -       }
1744 +       /* Fill out the mask with all FF's */
1745  
1746 -       for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
1747 -               REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
1748 +       for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
1749 +               dis_deauth_mask[i] = 0xff;
1750  
1751 -}
1752 +       /* copy the first byte of frame control field */
1753 +       dis_deauth_pattern[byte_cnt] = 0xa0;
1754 +       byte_cnt++;
1755  
1756 -void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
1757 -                               u8 *user_mask, int pattern_count,
1758 -                               int pattern_len)
1759 -{
1760 -       int i;
1761 -       u32 pattern_val, mask_val;
1762 -       u32 set, clr;
1763 +       /* skip 2nd byte of frame control and Duration field */
1764 +       byte_cnt += 3;
1765  
1766 -       /* FIXME: should check count by querying the hardware capability */
1767 -       if (pattern_count >= MAX_NUM_PATTERN)
1768 -               return;
1769 +       /*
1770 +        * need not match the destination mac address, it can be a broadcast
1771 +        * mac address or an unicast to this station
1772 +        */
1773 +       byte_cnt += 6;
1774  
1775 -       REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
1776 +       /* copy the source mac address */
1777 +       memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
1778  
1779 -       /* set the registers for pattern */
1780 -       for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
1781 -               memcpy(&pattern_val, user_pattern, 4);
1782 -               REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
1783 -                         pattern_val);
1784 -               user_pattern += 4;
1785 -       }
1786 +       byte_cnt += 6;
1787  
1788 -       /* set the registers for mask */
1789 -       for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
1790 -               memcpy(&mask_val, user_mask, 4);
1791 -               REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
1792 -               user_mask += 4;
1793 -       }
1794 +       /* copy the bssid, its same as the source mac address */
1795  
1796 -       /* set the pattern length to be matched
1797 -        *
1798 -        * AR_WOW_LENGTH1_REG1
1799 -        * bit 31:24 pattern 0 length
1800 -        * bit 23:16 pattern 1 length
1801 -        * bit 15:8 pattern 2 length
1802 -        * bit 7:0 pattern 3 length
1803 -        *
1804 -        * AR_WOW_LENGTH1_REG2
1805 -        * bit 31:24 pattern 4 length
1806 -        * bit 23:16 pattern 5 length
1807 -        * bit 15:8 pattern 6 length
1808 -        * bit 7:0 pattern 7 length
1809 -        *
1810 -        * the below logic writes out the new
1811 -        * pattern length for the corresponding
1812 -        * pattern_count, while masking out the
1813 -        * other fields
1814 -        */
1815 +       memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
1816  
1817 -       ah->wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
1818 +       /* Create Disassociate pattern mask */
1819  
1820 -       if (pattern_count < 4) {
1821 -               /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
1822 -               set = (pattern_len & AR_WOW_LENGTH_MAX) <<
1823 -                      AR_WOW_LEN1_SHIFT(pattern_count);
1824 -               clr = AR_WOW_LENGTH1_MASK(pattern_count);
1825 -               REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
1826 -       } else {
1827 -               /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
1828 -               set = (pattern_len & AR_WOW_LENGTH_MAX) <<
1829 -                      AR_WOW_LEN2_SHIFT(pattern_count);
1830 -               clr = AR_WOW_LENGTH2_MASK(pattern_count);
1831 -               REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
1832 -       }
1833 +       dis_deauth_mask[0] = 0xfe;
1834 +       dis_deauth_mask[1] = 0x03;
1835 +       dis_deauth_mask[2] = 0xc0;
1836  
1837 -}
1838 -EXPORT_SYMBOL(ath9k_hw_wow_apply_pattern);
1839 +       ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
1840  
1841 -u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
1842 -{
1843 -       u32 wow_status = 0;
1844 -       u32 val = 0, rval;
1845 +       ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
1846 +                                  pattern_count, byte_cnt);
1847  
1848 +       pattern_count++;
1849         /*
1850 -        * read the WoW status register to know
1851 -        * the wakeup reason
1852 +        * for de-authenticate pattern, only the first byte of the frame
1853 +        * control field gets changed from 0xA0 to 0xC0
1854          */
1855 -       rval = REG_READ(ah, AR_WOW_PATTERN);
1856 -       val = AR_WOW_STATUS(rval);
1857 +       dis_deauth_pattern[0] = 0xC0;
1858  
1859 -       /*
1860 -        * mask only the WoW events that we have enabled. Sometimes
1861 -        * we have spurious WoW events from the AR_WOW_PATTERN
1862 -        * register. This mask will clean it up.
1863 -        */
1864 +       ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
1865 +                                  pattern_count, byte_cnt);
1866  
1867 -       val &= ah->wow_event_mask;
1868 +}
1869  
1870 -       if (val) {
1871 -               if (val & AR_WOW_MAGIC_PAT_FOUND)
1872 -                       wow_status |= AH_WOW_MAGIC_PATTERN_EN;
1873 -               if (AR_WOW_PATTERN_FOUND(val))
1874 -                       wow_status |= AH_WOW_USER_PATTERN_EN;
1875 -               if (val & AR_WOW_KEEP_ALIVE_FAIL)
1876 -                       wow_status |= AH_WOW_LINK_CHANGE;
1877 -               if (val & AR_WOW_BEACON_FAIL)
1878 -                       wow_status |= AH_WOW_BEACON_MISS;
1879 -       }
1880 +static void ath9k_wow_add_pattern(struct ath_softc *sc,
1881 +                                 struct cfg80211_wowlan *wowlan)
1882 +{
1883 +       struct ath_hw *ah = sc->sc_ah;
1884 +       struct ath9k_wow_pattern *wow_pattern = NULL;
1885 +       struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
1886 +       int mask_len;
1887 +       s8 i = 0;
1888 +
1889 +       if (!wowlan->n_patterns)
1890 +               return;
1891  
1892         /*
1893 -        * set and clear WOW_PME_CLEAR registers for the chip to
1894 -        * generate next wow signal.
1895 -        * disable D3 before accessing other registers ?
1896 +        * Add the new user configured patterns
1897          */
1898 +       for (i = 0; i < wowlan->n_patterns; i++) {
1899  
1900 -       /* do we need to check the bit value 0x01000000 (7-10) ?? */
1901 -       REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,
1902 -               AR_PMCTRL_PWR_STATE_D1D3);
1903 +               wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
1904  
1905 -       /*
1906 -        * clear all events
1907 -        */
1908 -       REG_WRITE(ah, AR_WOW_PATTERN,
1909 -                 AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
1910 +               if (!wow_pattern)
1911 +                       return;
1912  
1913 -       /*
1914 -        * restore the beacon threshold to init value
1915 -        */
1916 -       REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
1917 +               /*
1918 +                * TODO: convert the generic user space pattern to
1919 +                * appropriate chip specific/802.11 pattern.
1920 +                */
1921  
1922 -       /*
1923 -        * Restore the way the PCI-E reset, Power-On-Reset, external
1924 -        * PCIE_POR_SHORT pins are tied to its original value.
1925 -        * Previously just before WoW sleep, we untie the PCI-E
1926 -        * reset to our Chip's Power On Reset so that any PCI-E
1927 -        * reset from the bus will not reset our chip
1928 -        */
1929 -       if (ah->is_pciexpress)
1930 -               ath9k_hw_configpcipowersave(ah, false);
1931 +               mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
1932 +               memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
1933 +               memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
1934 +               memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
1935 +                      patterns[i].pattern_len);
1936 +               memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
1937 +               wow_pattern->pattern_len = patterns[i].pattern_len;
1938 +
1939 +               /*
1940 +                * just need to take care of deauth and disssoc pattern,
1941 +                * make sure we don't overwrite them.
1942 +                */
1943 +
1944 +               ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
1945 +                                          wow_pattern->mask_bytes,
1946 +                                          i + 2,
1947 +                                          wow_pattern->pattern_len);
1948 +               kfree(wow_pattern);
1949  
1950 -       ah->wow_event_mask = 0;
1951 +       }
1952  
1953 -       return wow_status;
1954  }
1955 -EXPORT_SYMBOL(ath9k_hw_wow_wakeup);
1956  
1957 -void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
1958 +int ath9k_suspend(struct ieee80211_hw *hw,
1959 +                 struct cfg80211_wowlan *wowlan)
1960  {
1961 -       u32 wow_event_mask;
1962 -       u32 set, clr;
1963 +       struct ath_softc *sc = hw->priv;
1964 +       struct ath_hw *ah = sc->sc_ah;
1965 +       struct ath_common *common = ath9k_hw_common(ah);
1966 +       u32 wow_triggers_enabled = 0;
1967 +       int ret = 0;
1968  
1969 -       /*
1970 -        * wow_event_mask is a mask to the AR_WOW_PATTERN register to
1971 -        * indicate which WoW events we have enabled. The WoW events
1972 -        * are from the 'pattern_enable' in this function and
1973 -        * 'pattern_count' of ath9k_hw_wow_apply_pattern()
1974 -        */
1975 -       wow_event_mask = ah->wow_event_mask;
1976 +       mutex_lock(&sc->mutex);
1977  
1978 -       /*
1979 -        * Untie Power-on-Reset from the PCI-E-Reset. When we are in
1980 -        * WOW sleep, we do want the Reset from the PCI-E to disturb
1981 -        * our hw state
1982 -        */
1983 -       if (ah->is_pciexpress) {
1984 -               /*
1985 -                * we need to untie the internal POR (power-on-reset)
1986 -                * to the external PCI-E reset. We also need to tie
1987 -                * the PCI-E Phy reset to the PCI-E reset.
1988 -                */
1989 -               set = AR_WA_RESET_EN | AR_WA_POR_SHORT;
1990 -               clr = AR_WA_UNTIE_RESET_EN | AR_WA_D3_L1_DISABLE;
1991 -               REG_RMW(ah, AR_WA, set, clr);
1992 +       ath_cancel_work(sc);
1993 +       ath_stop_ani(sc);
1994 +       del_timer_sync(&sc->rx_poll_timer);
1995 +
1996 +       if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
1997 +               ath_dbg(common, ANY, "Device not present\n");
1998 +               ret = -EINVAL;
1999 +               goto fail_wow;
2000         }
2001  
2002 -       /*
2003 -        * set the power states appropriately and enable PME
2004 -        */
2005 -       set = AR_PMCTRL_HOST_PME_EN | AR_PMCTRL_PWR_PM_CTRL_ENA |
2006 -             AR_PMCTRL_AUX_PWR_DET | AR_PMCTRL_WOW_PME_CLR;
2007 +       if (WARN_ON(!wowlan)) {
2008 +               ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
2009 +               ret = -EINVAL;
2010 +               goto fail_wow;
2011 +       }
2012  
2013 -       /*
2014 -        * set and clear WOW_PME_CLEAR registers for the chip
2015 -        * to generate next wow signal.
2016 -        */
2017 -       REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
2018 -       clr = AR_PMCTRL_WOW_PME_CLR;
2019 -       REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
2020 +       if (!device_can_wakeup(sc->dev)) {
2021 +               ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
2022 +               ret = 1;
2023 +               goto fail_wow;
2024 +       }
2025  
2026         /*
2027 -        * Setup for:
2028 -        *      - beacon misses
2029 -        *      - magic pattern
2030 -        *      - keep alive timeout
2031 -        *      - pattern matching
2032 +        * none of the sta vifs are associated
2033 +        * and we are not currently handling multivif
2034 +        * cases, for instance we have to seperately
2035 +        * configure 'keep alive frame' for each
2036 +        * STA.
2037          */
2038  
2039 -       /*
2040 -        * Program default values for pattern backoff, aifs/slot/KAL count,
2041 -        * beacon miss timeout, KAL timeout, etc.
2042 -        */
2043 -       set = AR_WOW_BACK_OFF_SHIFT(AR_WOW_PAT_BACKOFF);
2044 -       REG_SET_BIT(ah, AR_WOW_PATTERN, set);
2045 +       if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
2046 +               ath_dbg(common, WOW, "None of the STA vifs are associated\n");
2047 +               ret = 1;
2048 +               goto fail_wow;
2049 +       }
2050 +
2051 +       if (sc->nvifs > 1) {
2052 +               ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
2053 +               ret = 1;
2054 +               goto fail_wow;
2055 +       }
2056  
2057 -       set = AR_WOW_AIFS_CNT(AR_WOW_CNT_AIFS_CNT) |
2058 -             AR_WOW_SLOT_CNT(AR_WOW_CNT_SLOT_CNT) |
2059 -             AR_WOW_KEEP_ALIVE_CNT(AR_WOW_CNT_KA_CNT);
2060 -       REG_SET_BIT(ah, AR_WOW_COUNT, set);
2061 -
2062 -       if (pattern_enable & AH_WOW_BEACON_MISS)
2063 -               set = AR_WOW_BEACON_TIMO;
2064 -       /* We are not using beacon miss, program a large value */
2065 -       else
2066 -               set = AR_WOW_BEACON_TIMO_MAX;
2067 +       ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
2068  
2069 -       REG_WRITE(ah, AR_WOW_BCN_TIMO, set);
2070 +       ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
2071 +               wow_triggers_enabled);
2072  
2073 -       /*
2074 -        * Keep alive timo in ms except AR9280
2075 -        */
2076 -       if (!pattern_enable)
2077 -               set = AR_WOW_KEEP_ALIVE_NEVER;
2078 -       else
2079 -               set = KAL_TIMEOUT * 32;
2080 +       ath9k_ps_wakeup(sc);
2081  
2082 -       REG_WRITE(ah, AR_WOW_KEEP_ALIVE_TIMO, set);
2083 +       ath9k_stop_btcoex(sc);
2084  
2085         /*
2086 -        * Keep alive delay in us. based on 'power on clock',
2087 -        * therefore in usec
2088 +        * Enable wake up on recieving disassoc/deauth
2089 +        * frame by default.
2090          */
2091 -       set = KAL_DELAY * 1000;
2092 -       REG_WRITE(ah, AR_WOW_KEEP_ALIVE_DELAY, set);
2093 +       ath9k_wow_add_disassoc_deauth_pattern(sc);
2094  
2095 -       /*
2096 -        * Create keep alive pattern to respond to beacons
2097 -        */
2098 -       ath9k_wow_create_keep_alive_pattern(ah);
2099 +       if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
2100 +               ath9k_wow_add_pattern(sc, wowlan);
2101  
2102 +       spin_lock_bh(&sc->sc_pcu_lock);
2103         /*
2104 -        * Configure MAC WoW Registers
2105 +        * To avoid false wake, we enable beacon miss interrupt only
2106 +        * when we go to sleep. We save the current interrupt mask
2107 +        * so we can restore it after the system wakes up
2108          */
2109 -       set = 0;
2110 -       /* Send keep alive timeouts anyway */
2111 -       clr = AR_WOW_KEEP_ALIVE_AUTO_DIS;
2112 -
2113 -       if (pattern_enable & AH_WOW_LINK_CHANGE)
2114 -               wow_event_mask |= AR_WOW_KEEP_ALIVE_FAIL;
2115 -       else
2116 -               set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
2117 +       sc->wow_intr_before_sleep = ah->imask;
2118 +       ah->imask &= ~ATH9K_INT_GLOBAL;
2119 +       ath9k_hw_disable_interrupts(ah);
2120 +       ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
2121 +       ath9k_hw_set_interrupts(ah);
2122 +       ath9k_hw_enable_interrupts(ah);
2123  
2124 -       set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
2125 -       REG_RMW(ah, AR_WOW_KEEP_ALIVE, set, clr);
2126 +       spin_unlock_bh(&sc->sc_pcu_lock);
2127  
2128         /*
2129 -        * we are relying on a bmiss failure. ensure we have
2130 -        * enough threshold to prevent false positives
2131 +        * we can now sync irq and kill any running tasklets, since we already
2132 +        * disabled interrupts and not holding a spin lock
2133          */
2134 -       REG_RMW_FIELD(ah, AR_RSSI_THR, AR_RSSI_THR_BM_THR,
2135 -                     AR_WOW_BMISSTHRESHOLD);
2136 +       synchronize_irq(sc->irq);
2137 +       tasklet_kill(&sc->intr_tq);
2138 +
2139 +       ath9k_hw_wow_enable(ah, wow_triggers_enabled);
2140  
2141 -       set = 0;
2142 -       clr = 0;
2143 +       ath9k_ps_restore(sc);
2144 +       ath_dbg(common, ANY, "WoW enabled in ath9k\n");
2145 +       atomic_inc(&sc->wow_sleep_proc_intr);
2146  
2147 -       if (pattern_enable & AH_WOW_BEACON_MISS) {
2148 -               set = AR_WOW_BEACON_FAIL_EN;
2149 -               wow_event_mask |= AR_WOW_BEACON_FAIL;
2150 -       } else {
2151 -               clr = AR_WOW_BEACON_FAIL_EN;
2152 +fail_wow:
2153 +       mutex_unlock(&sc->mutex);
2154 +       return ret;
2155 +}
2156 +
2157 +int ath9k_resume(struct ieee80211_hw *hw)
2158 +{
2159 +       struct ath_softc *sc = hw->priv;
2160 +       struct ath_hw *ah = sc->sc_ah;
2161 +       struct ath_common *common = ath9k_hw_common(ah);
2162 +       u32 wow_status;
2163 +
2164 +       mutex_lock(&sc->mutex);
2165 +
2166 +       ath9k_ps_wakeup(sc);
2167 +
2168 +       spin_lock_bh(&sc->sc_pcu_lock);
2169 +
2170 +       ath9k_hw_disable_interrupts(ah);
2171 +       ah->imask = sc->wow_intr_before_sleep;
2172 +       ath9k_hw_set_interrupts(ah);
2173 +       ath9k_hw_enable_interrupts(ah);
2174 +
2175 +       spin_unlock_bh(&sc->sc_pcu_lock);
2176 +
2177 +       wow_status = ath9k_hw_wow_wakeup(ah);
2178 +
2179 +       if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
2180 +               /*
2181 +                * some devices may not pick beacon miss
2182 +                * as the reason they woke up so we add
2183 +                * that here for that shortcoming.
2184 +                */
2185 +               wow_status |= AH_WOW_BEACON_MISS;
2186 +               atomic_dec(&sc->wow_got_bmiss_intr);
2187 +               ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
2188         }
2189  
2190 -       REG_RMW(ah, AR_WOW_BCN_EN, set, clr);
2191 +       atomic_dec(&sc->wow_sleep_proc_intr);
2192  
2193 -       set = 0;
2194 -       clr = 0;
2195 -       /*
2196 -        * Enable the magic packet registers
2197 -        */
2198 -       if (pattern_enable & AH_WOW_MAGIC_PATTERN_EN) {
2199 -               set = AR_WOW_MAGIC_EN;
2200 -               wow_event_mask |= AR_WOW_MAGIC_PAT_FOUND;
2201 -       } else {
2202 -               clr = AR_WOW_MAGIC_EN;
2203 +       if (wow_status) {
2204 +               ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
2205 +                       ath9k_hw_wow_event_to_string(wow_status), wow_status);
2206         }
2207 -       set |= AR_WOW_MAC_INTR_EN;
2208 -       REG_RMW(ah, AR_WOW_PATTERN, set, clr);
2209  
2210 -       REG_WRITE(ah, AR_WOW_PATTERN_MATCH_LT_256B,
2211 -                 AR_WOW_PATTERN_SUPPORTED);
2212 +       ath_restart_work(sc);
2213 +       ath9k_start_btcoex(sc);
2214  
2215 -       /*
2216 -        * Set the power states appropriately and enable PME
2217 -        */
2218 -       clr = 0;
2219 -       set = AR_PMCTRL_PWR_STATE_D1D3 | AR_PMCTRL_HOST_PME_EN |
2220 -             AR_PMCTRL_PWR_PM_CTRL_ENA;
2221 +       ath9k_ps_restore(sc);
2222 +       mutex_unlock(&sc->mutex);
2223  
2224 -       clr = AR_PCIE_PM_CTRL_ENA;
2225 -       REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
2226 +       return 0;
2227 +}
2228  
2229 -       /*
2230 -        * this is needed to prevent the chip waking up
2231 -        * the host within 3-4 seconds with certain
2232 -        * platform/BIOS. The fix is to enable
2233 -        * D1 & D3 to match original definition and
2234 -        * also match the OTP value. Anyway this
2235 -        * is more related to SW WOW.
2236 -        */
2237 -       clr = AR_PMCTRL_PWR_STATE_D1D3;
2238 -       REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
2239 +void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
2240 +{
2241 +       struct ath_softc *sc = hw->priv;
2242  
2243 -       set = AR_PMCTRL_PWR_STATE_D1D3_REAL;
2244 -       REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
2245 +       mutex_lock(&sc->mutex);
2246 +       device_init_wakeup(sc->dev, 1);
2247 +       device_set_wakeup_enable(sc->dev, enabled);
2248 +       mutex_unlock(&sc->mutex);
2249 +}
2250  
2251 -       REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
2252 +void ath9k_init_wow(struct ieee80211_hw *hw)
2253 +{
2254 +       struct ath_softc *sc = hw->priv;
2255  
2256 -       /* to bring down WOW power low margin */
2257 -       set = BIT(13);
2258 -       REG_SET_BIT(ah, AR_PCIE_PHY_REG3, set);
2259 -       /* HW WoW */
2260 -       clr = BIT(5);
2261 -       REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, clr);
2262 +       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
2263 +           (sc->driver_data & ATH9K_PCI_WOW) &&
2264 +           device_can_wakeup(sc->dev))
2265 +               hw->wiphy->wowlan = &ath9k_wowlan_support;
2266  
2267 -       ath9k_hw_set_powermode_wow_sleep(ah);
2268 -       ah->wow_event_mask = wow_event_mask;
2269 +       atomic_set(&sc->wow_sleep_proc_intr, -1);
2270 +       atomic_set(&sc->wow_got_bmiss_intr, -1);
2271  }
2272 -EXPORT_SYMBOL(ath9k_hw_wow_enable);
2273 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2274 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
2275 @@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc 
2276                 if (!ATH_TXQ_SETUP(sc, i))
2277                         continue;
2278  
2279 +               if (!sc->tx.txq[i].axq_depth)
2280 +                       continue;
2281 +
2282                 if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum))
2283                         npend |= BIT(i);
2284         }
2285 @@ -2749,6 +2752,8 @@ void ath_tx_node_cleanup(struct ath_soft
2286         }
2287  }
2288  
2289 +#ifdef CONFIG_ATH9K_TX99
2290 +
2291  int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
2292                     struct ath_tx_control *txctl)
2293  {
2294 @@ -2791,3 +2796,5 @@ int ath9k_tx99_send(struct ath_softc *sc
2295  
2296         return 0;
2297  }
2298 +
2299 +#endif /* CONFIG_ATH9K_TX99 */
2300 --- a/drivers/net/wireless/ath/regd.c
2301 +++ b/drivers/net/wireless/ath/regd.c
2302 @@ -37,17 +37,17 @@ static int __ath_regd_init(struct ath_re
2303  
2304  /* We enable active scan on these a case by case basis by regulatory domain */
2305  #define ATH9K_2GHZ_CH12_13     REG_RULE(2467-10, 2472+10, 40, 0, 20,\
2306 -                                       NL80211_RRF_PASSIVE_SCAN)
2307 +                                       NL80211_RRF_NO_IR)
2308  #define ATH9K_2GHZ_CH14                REG_RULE(2484-10, 2484+10, 40, 0, 20,\
2309 -                               NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
2310 +                               NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
2311  
2312  /* We allow IBSS on these on a case by case basis by regulatory domain */
2313  #define ATH9K_5GHZ_5150_5350   REG_RULE(5150-10, 5350+10, 80, 0, 30,\
2314 -                               NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
2315 +                               NL80211_RRF_NO_IR)
2316  #define ATH9K_5GHZ_5470_5850   REG_RULE(5470-10, 5850+10, 80, 0, 30,\
2317 -                               NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
2318 +                               NL80211_RRF_NO_IR)
2319  #define ATH9K_5GHZ_5725_5850   REG_RULE(5725-10, 5850+10, 80, 0, 30,\
2320 -                               NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
2321 +                               NL80211_RRF_NO_IR)
2322  
2323  #define ATH9K_2GHZ_ALL         ATH9K_2GHZ_CH01_11, \
2324                                 ATH9K_2GHZ_CH12_13, \
2325 @@ -224,17 +224,16 @@ ath_reg_apply_beaconing_flags(struct wip
2326                                  * regulatory_hint().
2327                                  */
2328                                 if (!(reg_rule->flags &
2329 -                                   NL80211_RRF_NO_IBSS))
2330 +                                   NL80211_RRF_NO_IR))
2331                                         ch->flags &=
2332 -                                         ~IEEE80211_CHAN_NO_IBSS;
2333 +                                         ~IEEE80211_CHAN_NO_IR;
2334                                 if (!(reg_rule->flags &
2335 -                                   NL80211_RRF_PASSIVE_SCAN))
2336 +                                   NL80211_RRF_NO_IR))
2337                                         ch->flags &=
2338 -                                         ~IEEE80211_CHAN_PASSIVE_SCAN;
2339 +                                         ~IEEE80211_CHAN_NO_IR;
2340                         } else {
2341                                 if (ch->beacon_found)
2342 -                                       ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
2343 -                                         IEEE80211_CHAN_PASSIVE_SCAN);
2344 +                                       ch->flags &= ~IEEE80211_CHAN_NO_IR;
2345                         }
2346                 }
2347         }
2348 @@ -260,11 +259,11 @@ ath_reg_apply_active_scan_flags(struct w
2349          */
2350         if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
2351                 ch = &sband->channels[11]; /* CH 12 */
2352 -               if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2353 -                       ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
2354 +               if (ch->flags & IEEE80211_CHAN_NO_IR)
2355 +                       ch->flags &= ~IEEE80211_CHAN_NO_IR;
2356                 ch = &sband->channels[12]; /* CH 13 */
2357 -               if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2358 -                       ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
2359 +               if (ch->flags & IEEE80211_CHAN_NO_IR)
2360 +                       ch->flags &= ~IEEE80211_CHAN_NO_IR;
2361                 return;
2362         }
2363  
2364 @@ -278,17 +277,17 @@ ath_reg_apply_active_scan_flags(struct w
2365         ch = &sband->channels[11]; /* CH 12 */
2366         reg_rule = freq_reg_info(wiphy, ch->center_freq);
2367         if (!IS_ERR(reg_rule)) {
2368 -               if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
2369 -                       if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2370 -                               ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
2371 +               if (!(reg_rule->flags & NL80211_RRF_NO_IR))
2372 +                       if (ch->flags & IEEE80211_CHAN_NO_IR)
2373 +                               ch->flags &= ~IEEE80211_CHAN_NO_IR;
2374         }
2375  
2376         ch = &sband->channels[12]; /* CH 13 */
2377         reg_rule = freq_reg_info(wiphy, ch->center_freq);
2378         if (!IS_ERR(reg_rule)) {
2379 -               if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
2380 -                       if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2381 -                               ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
2382 +               if (!(reg_rule->flags & NL80211_RRF_NO_IR))
2383 +                       if (ch->flags & IEEE80211_CHAN_NO_IR)
2384 +                               ch->flags &= ~IEEE80211_CHAN_NO_IR;
2385         }
2386  }
2387  
2388 @@ -320,8 +319,8 @@ static void ath_reg_apply_radar_flags(st
2389                  */
2390                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
2391                         ch->flags |= IEEE80211_CHAN_RADAR |
2392 -                                    IEEE80211_CHAN_NO_IBSS |
2393 -                                    IEEE80211_CHAN_PASSIVE_SCAN;
2394 +                                    IEEE80211_CHAN_NO_IR |
2395 +                                    IEEE80211_CHAN_NO_IR;
2396         }
2397  }
2398  
2399 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
2400 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
2401 @@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct br
2402                         struct ieee80211_channel *chan = request->channels[i];
2403  
2404                         if (chan->flags & (IEEE80211_CHAN_RADAR |
2405 -                                          IEEE80211_CHAN_PASSIVE_SCAN))
2406 +                                          IEEE80211_CHAN_NO_IR))
2407                                 continue;
2408  
2409                         chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,
2410 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2411 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2412 @@ -202,9 +202,9 @@ static struct ieee80211_supported_band _
2413  
2414  /* This is to override regulatory domains defined in cfg80211 module (reg.c)
2415   * By default world regulatory domain defined in reg.c puts the flags
2416 - * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for
2417 - * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't
2418 - * start p2p operations on 5GHz channels. All the changes in world regulatory
2419 + * NL80211_RRF_NO_IR for 5GHz channels (for * 36..48 and 149..165).
2420 + * With respect to these flags, wpa_supplicant doesn't * start p2p
2421 + * operations on 5GHz channels. All the changes in world regulatory
2422   * domain are to be done here.
2423   */
2424  static const struct ieee80211_regdomain brcmf_regdom = {
2425 @@ -5197,10 +5197,10 @@ static s32 brcmf_construct_reginfo(struc
2426                                         if (channel & WL_CHAN_RADAR)
2427                                                 band_chan_arr[index].flags |=
2428                                                         (IEEE80211_CHAN_RADAR |
2429 -                                                       IEEE80211_CHAN_NO_IBSS);
2430 +                                                       IEEE80211_CHAN_NO_IR);
2431                                         if (channel & WL_CHAN_PASSIVE)
2432                                                 band_chan_arr[index].flags |=
2433 -                                                   IEEE80211_CHAN_PASSIVE_SCAN;
2434 +                                                   IEEE80211_CHAN_NO_IR;
2435                                 }
2436                         }
2437                         if (!update)
2438 --- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
2439 +++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
2440 @@ -59,23 +59,20 @@
2441  
2442  #define BRCM_2GHZ_2412_2462    REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
2443  #define BRCM_2GHZ_2467_2472    REG_RULE(2467-10, 2472+10, 20, 0, 19, \
2444 -                                        NL80211_RRF_PASSIVE_SCAN | \
2445 -                                        NL80211_RRF_NO_IBSS)
2446 +                                        NL80211_RRF_NO_IR)
2447  
2448  #define BRCM_5GHZ_5180_5240    REG_RULE(5180-10, 5240+10, 40, 0, 21, \
2449 -                                        NL80211_RRF_PASSIVE_SCAN | \
2450 -                                        NL80211_RRF_NO_IBSS)
2451 +                                        NL80211_RRF_NO_IR)
2452  #define BRCM_5GHZ_5260_5320    REG_RULE(5260-10, 5320+10, 40, 0, 21, \
2453 -                                        NL80211_RRF_PASSIVE_SCAN | \
2454 +                                        NL80211_RRF_NO_IR | \
2455                                          NL80211_RRF_DFS | \
2456 -                                        NL80211_RRF_NO_IBSS)
2457 +                                        NL80211_RRF_NO_IR)
2458  #define BRCM_5GHZ_5500_5700    REG_RULE(5500-10, 5700+10, 40, 0, 21, \
2459 -                                        NL80211_RRF_PASSIVE_SCAN | \
2460 +                                        NL80211_RRF_NO_IR | \
2461                                          NL80211_RRF_DFS | \
2462 -                                        NL80211_RRF_NO_IBSS)
2463 +                                        NL80211_RRF_NO_IR)
2464  #define BRCM_5GHZ_5745_5825    REG_RULE(5745-10, 5825+10, 40, 0, 21, \
2465 -                                        NL80211_RRF_PASSIVE_SCAN | \
2466 -                                        NL80211_RRF_NO_IBSS)
2467 +                                        NL80211_RRF_NO_IR)
2468  
2469  static const struct ieee80211_regdomain brcms_regdom_x2 = {
2470         .n_reg_rules = 6,
2471 @@ -395,7 +392,7 @@ brcms_c_channel_set_chanspec(struct brcm
2472                 brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
2473  
2474         brcms_b_set_chanspec(wlc->hw, chanspec,
2475 -                             !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
2476 +                             !!(ch->flags & IEEE80211_CHAN_NO_IR),
2477                               &txpwr);
2478  }
2479  
2480 @@ -657,8 +654,8 @@ static void brcms_reg_apply_radar_flags(
2481                  */
2482                 if (!(ch->flags & IEEE80211_CHAN_DISABLED))
2483                         ch->flags |= IEEE80211_CHAN_RADAR |
2484 -                                    IEEE80211_CHAN_NO_IBSS |
2485 -                                    IEEE80211_CHAN_PASSIVE_SCAN;
2486 +                                    IEEE80211_CHAN_NO_IR |
2487 +                                    IEEE80211_CHAN_NO_IR;
2488         }
2489  }
2490  
2491 @@ -688,14 +685,13 @@ brcms_reg_apply_beaconing_flags(struct w
2492                                 if (IS_ERR(rule))
2493                                         continue;
2494  
2495 -                               if (!(rule->flags & NL80211_RRF_NO_IBSS))
2496 -                                       ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
2497 -                               if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
2498 +                               if (!(rule->flags & NL80211_RRF_NO_IR))
2499 +                                       ch->flags &= ~IEEE80211_CHAN_NO_IR;
2500 +                               if (!(rule->flags & NL80211_RRF_NO_IR))
2501                                         ch->flags &=
2502 -                                               ~IEEE80211_CHAN_PASSIVE_SCAN;
2503 +                                               ~IEEE80211_CHAN_NO_IR;
2504                         } else if (ch->beacon_found) {
2505 -                               ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
2506 -                                              IEEE80211_CHAN_PASSIVE_SCAN);
2507 +                               ch->flags &= ~IEEE80211_CHAN_NO_IR;
2508                         }
2509                 }
2510         }
2511 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
2512 +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
2513 @@ -125,13 +125,13 @@ static struct ieee80211_channel brcms_2g
2514         CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
2515         CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
2516         CHAN2GHZ(12, 2467,
2517 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
2518 +                IEEE80211_CHAN_NO_IR |
2519                  IEEE80211_CHAN_NO_HT40PLUS),
2520         CHAN2GHZ(13, 2472,
2521 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
2522 +                IEEE80211_CHAN_NO_IR |
2523                  IEEE80211_CHAN_NO_HT40PLUS),
2524         CHAN2GHZ(14, 2484,
2525 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
2526 +                IEEE80211_CHAN_NO_IR |
2527                  IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS |
2528                  IEEE80211_CHAN_NO_OFDM)
2529  };
2530 @@ -144,51 +144,51 @@ static struct ieee80211_channel brcms_5g
2531         CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
2532         /* UNII-2 */
2533         CHAN5GHZ(52,
2534 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2535 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2536 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2537 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2538         CHAN5GHZ(56,
2539 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2540 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2541 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2542 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2543         CHAN5GHZ(60,
2544 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2545 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2546 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2547 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2548         CHAN5GHZ(64,
2549 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2550 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2551 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2552 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2553         /* MID */
2554         CHAN5GHZ(100,
2555 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2556 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2557 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2558 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2559         CHAN5GHZ(104,
2560 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2561 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2562 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2563 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2564         CHAN5GHZ(108,
2565 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2566 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2567 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2568 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2569         CHAN5GHZ(112,
2570 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2571 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2572 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2573 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2574         CHAN5GHZ(116,
2575 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2576 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2577 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2578 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2579         CHAN5GHZ(120,
2580 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2581 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2582 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2583 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2584         CHAN5GHZ(124,
2585 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2586 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2587 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2588 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2589         CHAN5GHZ(128,
2590 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2591 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2592 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2593 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2594         CHAN5GHZ(132,
2595 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2596 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
2597 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2598 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
2599         CHAN5GHZ(136,
2600 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2601 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
2602 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2603 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
2604         CHAN5GHZ(140,
2605 -                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
2606 -                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
2607 +                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
2608 +                IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS |
2609                  IEEE80211_CHAN_NO_HT40MINUS),
2610         /* UNII-3 */
2611         CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
2612 --- a/drivers/net/wireless/cw1200/scan.c
2613 +++ b/drivers/net/wireless/cw1200/scan.c
2614 @@ -197,9 +197,9 @@ void cw1200_scan_work(struct work_struct
2615                         if ((*it)->band != first->band)
2616                                 break;
2617                         if (((*it)->flags ^ first->flags) &
2618 -                                       IEEE80211_CHAN_PASSIVE_SCAN)
2619 +                                       IEEE80211_CHAN_NO_IR)
2620                                 break;
2621 -                       if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
2622 +                       if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
2623                             (*it)->max_power != first->max_power)
2624                                 break;
2625                 }
2626 @@ -210,7 +210,7 @@ void cw1200_scan_work(struct work_struct
2627                 else
2628                         scan.max_tx_rate = WSM_TRANSMIT_RATE_1;
2629                 scan.num_probes =
2630 -                       (first->flags & IEEE80211_CHAN_PASSIVE_SCAN) ? 0 : 2;
2631 +                       (first->flags & IEEE80211_CHAN_NO_IR) ? 0 : 2;
2632                 scan.num_ssids = priv->scan.n_ssids;
2633                 scan.ssids = &priv->scan.ssids[0];
2634                 scan.num_channels = it - priv->scan.curr;
2635 @@ -233,7 +233,7 @@ void cw1200_scan_work(struct work_struct
2636                 }
2637                 for (i = 0; i < scan.num_channels; ++i) {
2638                         scan.ch[i].number = priv->scan.curr[i]->hw_value;
2639 -                       if (priv->scan.curr[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
2640 +                       if (priv->scan.curr[i]->flags & IEEE80211_CHAN_NO_IR) {
2641                                 scan.ch[i].min_chan_time = 50;
2642                                 scan.ch[i].max_chan_time = 100;
2643                         } else {
2644 @@ -241,7 +241,7 @@ void cw1200_scan_work(struct work_struct
2645                                 scan.ch[i].max_chan_time = 25;
2646                         }
2647                 }
2648 -               if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
2649 +               if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
2650                     priv->scan.output_power != first->max_power) {
2651                         priv->scan.output_power = first->max_power;
2652                         wsm_set_output_power(priv,
2653 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
2654 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
2655 @@ -1934,10 +1934,10 @@ static int ipw2100_wdev_init(struct net_
2656                         bg_band->channels[i].max_power = geo->bg[i].max_power;
2657                         if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
2658                                 bg_band->channels[i].flags |=
2659 -                                       IEEE80211_CHAN_PASSIVE_SCAN;
2660 +                                       IEEE80211_CHAN_NO_IR;
2661                         if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
2662                                 bg_band->channels[i].flags |=
2663 -                                       IEEE80211_CHAN_NO_IBSS;
2664 +                                       IEEE80211_CHAN_NO_IR;
2665                         if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
2666                                 bg_band->channels[i].flags |=
2667                                         IEEE80211_CHAN_RADAR;
2668 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
2669 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
2670 @@ -11472,10 +11472,10 @@ static int ipw_wdev_init(struct net_devi
2671                         bg_band->channels[i].max_power = geo->bg[i].max_power;
2672                         if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
2673                                 bg_band->channels[i].flags |=
2674 -                                       IEEE80211_CHAN_PASSIVE_SCAN;
2675 +                                       IEEE80211_CHAN_NO_IR;
2676                         if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
2677                                 bg_band->channels[i].flags |=
2678 -                                       IEEE80211_CHAN_NO_IBSS;
2679 +                                       IEEE80211_CHAN_NO_IR;
2680                         if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
2681                                 bg_band->channels[i].flags |=
2682                                         IEEE80211_CHAN_RADAR;
2683 @@ -11511,10 +11511,10 @@ static int ipw_wdev_init(struct net_devi
2684                         a_band->channels[i].max_power = geo->a[i].max_power;
2685                         if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY)
2686                                 a_band->channels[i].flags |=
2687 -                                       IEEE80211_CHAN_PASSIVE_SCAN;
2688 +                                       IEEE80211_CHAN_NO_IR;
2689                         if (geo->a[i].flags & LIBIPW_CH_NO_IBSS)
2690                                 a_band->channels[i].flags |=
2691 -                                       IEEE80211_CHAN_NO_IBSS;
2692 +                                       IEEE80211_CHAN_NO_IR;
2693                         if (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT)
2694                                 a_band->channels[i].flags |=
2695                                         IEEE80211_CHAN_RADAR;
2696 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
2697 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
2698 @@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_p
2699                  *  and use long active_dwell time.
2700                  */
2701                 if (!is_active || il_is_channel_passive(ch_info) ||
2702 -                   (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
2703 +                   (chan->flags & IEEE80211_CHAN_NO_IR)) {
2704                         scan_ch->type = 0;      /* passive */
2705                         if (IL_UCODE_API(il->ucode_ver) == 1)
2706                                 scan_ch->active_dwell =
2707 --- a/drivers/net/wireless/iwlegacy/4965-mac.c
2708 +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
2709 @@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_p
2710                 }
2711  
2712                 if (!is_active || il_is_channel_passive(ch_info) ||
2713 -                   (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
2714 +                   (chan->flags & IEEE80211_CHAN_NO_IR))
2715                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
2716                 else
2717                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
2718 --- a/drivers/net/wireless/iwlegacy/common.c
2719 +++ b/drivers/net/wireless/iwlegacy/common.c
2720 @@ -3447,10 +3447,10 @@ il_init_geos(struct il_priv *il)
2721  
2722                 if (il_is_channel_valid(ch)) {
2723                         if (!(ch->flags & EEPROM_CHANNEL_IBSS))
2724 -                               geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
2725 +                               geo_ch->flags |= IEEE80211_CHAN_NO_IR;
2726  
2727                         if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
2728 -                               geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
2729 +                               geo_ch->flags |= IEEE80211_CHAN_NO_IR;
2730  
2731                         if (ch->flags & EEPROM_CHANNEL_RADAR)
2732                                 geo_ch->flags |= IEEE80211_CHAN_RADAR;
2733 --- a/drivers/net/wireless/iwlegacy/debug.c
2734 +++ b/drivers/net/wireless/iwlegacy/debug.c
2735 @@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file *file
2736                                       flags & IEEE80211_CHAN_RADAR ?
2737                                       " (IEEE 802.11h required)" : "",
2738                                       ((channels[i].
2739 -                                       flags & IEEE80211_CHAN_NO_IBSS) ||
2740 +                                       flags & IEEE80211_CHAN_NO_IR) ||
2741                                        (channels[i].
2742                                         flags & IEEE80211_CHAN_RADAR)) ? "" :
2743                                       ", IBSS",
2744                                       channels[i].
2745 -                                     flags & IEEE80211_CHAN_PASSIVE_SCAN ?
2746 +                                     flags & IEEE80211_CHAN_NO_IR ?
2747                                       "passive only" : "active/passive");
2748         }
2749         supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
2750 @@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file *file
2751                                       flags & IEEE80211_CHAN_RADAR ?
2752                                       " (IEEE 802.11h required)" : "",
2753                                       ((channels[i].
2754 -                                       flags & IEEE80211_CHAN_NO_IBSS) ||
2755 +                                       flags & IEEE80211_CHAN_NO_IR) ||
2756                                        (channels[i].
2757                                         flags & IEEE80211_CHAN_RADAR)) ? "" :
2758                                       ", IBSS",
2759                                       channels[i].
2760 -                                     flags & IEEE80211_CHAN_PASSIVE_SCAN ?
2761 +                                     flags & IEEE80211_CHAN_NO_IR ?
2762                                       "passive only" : "active/passive");
2763         }
2764         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
2765 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
2766 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
2767 @@ -352,12 +352,12 @@ static ssize_t iwl_dbgfs_channels_read(s
2768                                         channels[i].max_power,
2769                                         channels[i].flags & IEEE80211_CHAN_RADAR ?
2770                                         " (IEEE 802.11h required)" : "",
2771 -                                       ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
2772 +                                       ((channels[i].flags & IEEE80211_CHAN_NO_IR)
2773                                         || (channels[i].flags &
2774                                         IEEE80211_CHAN_RADAR)) ? "" :
2775                                         ", IBSS",
2776                                         channels[i].flags &
2777 -                                       IEEE80211_CHAN_PASSIVE_SCAN ?
2778 +                                       IEEE80211_CHAN_NO_IR ?
2779                                         "passive only" : "active/passive");
2780         }
2781         supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
2782 @@ -375,12 +375,12 @@ static ssize_t iwl_dbgfs_channels_read(s
2783                                         channels[i].max_power,
2784                                         channels[i].flags & IEEE80211_CHAN_RADAR ?
2785                                         " (IEEE 802.11h required)" : "",
2786 -                                       ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
2787 +                                       ((channels[i].flags & IEEE80211_CHAN_NO_IR)
2788                                         || (channels[i].flags &
2789                                         IEEE80211_CHAN_RADAR)) ? "" :
2790                                         ", IBSS",
2791                                         channels[i].flags &
2792 -                                       IEEE80211_CHAN_PASSIVE_SCAN ?
2793 +                                       IEEE80211_CHAN_NO_IR ?
2794                                         "passive only" : "active/passive");
2795         }
2796         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
2797 --- a/drivers/net/wireless/iwlwifi/dvm/scan.c
2798 +++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
2799 @@ -544,7 +544,7 @@ static int iwl_get_channels_for_scan(str
2800                 channel = chan->hw_value;
2801                 scan_ch->channel = cpu_to_le16(channel);
2802  
2803 -               if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
2804 +               if (!is_active || (chan->flags & IEEE80211_CHAN_NO_IR))
2805                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
2806                 else
2807                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
2808 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
2809 +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
2810 @@ -614,10 +614,10 @@ static int iwl_init_channel_map(struct d
2811                         channel->flags = IEEE80211_CHAN_NO_HT40;
2812  
2813                         if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
2814 -                               channel->flags |= IEEE80211_CHAN_NO_IBSS;
2815 +                               channel->flags |= IEEE80211_CHAN_NO_IR;
2816  
2817                         if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
2818 -                               channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
2819 +                               channel->flags |= IEEE80211_CHAN_NO_IR;
2820  
2821                         if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
2822                                 channel->flags |= IEEE80211_CHAN_RADAR;
2823 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
2824 +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
2825 @@ -223,10 +223,10 @@ static int iwl_init_channel_map(struct d
2826                         channel->flags |= IEEE80211_CHAN_NO_160MHZ;
2827  
2828                 if (!(ch_flags & NVM_CHANNEL_IBSS))
2829 -                       channel->flags |= IEEE80211_CHAN_NO_IBSS;
2830 +                       channel->flags |= IEEE80211_CHAN_NO_IR;
2831  
2832                 if (!(ch_flags & NVM_CHANNEL_ACTIVE))
2833 -                       channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
2834 +                       channel->flags |= IEEE80211_CHAN_NO_IR;
2835  
2836                 if (ch_flags & NVM_CHANNEL_RADAR)
2837                         channel->flags |= IEEE80211_CHAN_RADAR;
2838 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
2839 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
2840 @@ -192,7 +192,7 @@ static void iwl_mvm_scan_fill_channels(s
2841         for (i = 0; i < cmd->channel_count; i++) {
2842                 chan->channel = cpu_to_le16(req->channels[i]->hw_value);
2843                 chan->type = cpu_to_le32(type);
2844 -               if (req->channels[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2845 +               if (req->channels[i]->flags & IEEE80211_CHAN_NO_IR)
2846                         chan->type &= cpu_to_le32(~SCAN_CHANNEL_TYPE_ACTIVE);
2847                 chan->active_dwell = cpu_to_le16(active_dwell);
2848                 chan->passive_dwell = cpu_to_le16(passive_dwell);
2849 @@ -642,7 +642,7 @@ static void iwl_build_channel_cfg(struct
2850                 channels->iter_count[index] = cpu_to_le16(1);
2851                 channels->iter_interval[index] = 0;
2852  
2853 -               if (!(s_band->channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
2854 +               if (!(s_band->channels[i].flags & IEEE80211_CHAN_NO_IR))
2855                         channels->type[index] |=
2856                                 cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_ACTIVE);
2857  
2858 --- a/drivers/net/wireless/mac80211_hwsim.c
2859 +++ b/drivers/net/wireless/mac80211_hwsim.c
2860 @@ -159,7 +159,7 @@ static const struct ieee80211_regdomain 
2861         .reg_rules = {
2862                 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0),
2863                 REG_RULE(5725-10, 5850+10, 40, 0, 30,
2864 -                       NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
2865 +                        NL80211_RRF_NO_IR),
2866         }
2867  };
2868  
2869 @@ -1485,7 +1485,7 @@ static void hw_scan_work(struct work_str
2870                     req->channels[hwsim->scan_chan_idx]->center_freq);
2871  
2872         hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
2873 -       if (hwsim->tmp_chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
2874 +       if (hwsim->tmp_chan->flags & IEEE80211_CHAN_NO_IR ||
2875             !req->n_ssids) {
2876                 dwell = 120;
2877         } else {
2878 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2879 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2880 @@ -50,24 +50,24 @@ static const struct ieee80211_regdomain 
2881                 REG_RULE(2412-10, 2462+10, 40, 3, 20, 0),
2882                 /* Channel 12 - 13 */
2883                 REG_RULE(2467-10, 2472+10, 20, 3, 20,
2884 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
2885 +                        NL80211_RRF_NO_IR),
2886                 /* Channel 14 */
2887                 REG_RULE(2484-10, 2484+10, 20, 3, 20,
2888 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
2889 +                        NL80211_RRF_NO_IR |
2890                          NL80211_RRF_NO_OFDM),
2891                 /* Channel 36 - 48 */
2892                 REG_RULE(5180-10, 5240+10, 40, 3, 20,
2893 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
2894 +                        NL80211_RRF_NO_IR),
2895                 /* Channel 149 - 165 */
2896                 REG_RULE(5745-10, 5825+10, 40, 3, 20,
2897 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
2898 +                        NL80211_RRF_NO_IR),
2899                 /* Channel 52 - 64 */
2900                 REG_RULE(5260-10, 5320+10, 40, 3, 30,
2901 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
2902 +                        NL80211_RRF_NO_IR |
2903                          NL80211_RRF_DFS),
2904                 /* Channel 100 - 140 */
2905                 REG_RULE(5500-10, 5700+10, 40, 3, 30,
2906 -                        NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
2907 +                        NL80211_RRF_NO_IR |
2908                          NL80211_RRF_DFS),
2909         }
2910  };
2911 @@ -1968,7 +1968,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiph
2912                 user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
2913                 user_scan_cfg->chan_list[i].radio_type = chan->band;
2914  
2915 -               if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2916 +               if (chan->flags & IEEE80211_CHAN_NO_IR)
2917                         user_scan_cfg->chan_list[i].scan_type =
2918                                                 MWIFIEX_SCAN_TYPE_PASSIVE;
2919                 else
2920 --- a/drivers/net/wireless/mwifiex/scan.c
2921 +++ b/drivers/net/wireless/mwifiex/scan.c
2922 @@ -515,14 +515,14 @@ mwifiex_scan_create_channel_list(struct 
2923                                 scan_chan_list[chan_idx].max_scan_time =
2924                                         cpu_to_le16((u16) user_scan_in->
2925                                         chan_list[0].scan_time);
2926 -                       else if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2927 +                       else if (ch->flags & IEEE80211_CHAN_NO_IR)
2928                                 scan_chan_list[chan_idx].max_scan_time =
2929                                         cpu_to_le16(adapter->passive_scan_time);
2930                         else
2931                                 scan_chan_list[chan_idx].max_scan_time =
2932                                         cpu_to_le16(adapter->active_scan_time);
2933  
2934 -                       if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
2935 +                       if (ch->flags & IEEE80211_CHAN_NO_IR)
2936                                 scan_chan_list[chan_idx].chan_scan_mode_bitmap
2937                                         |= MWIFIEX_PASSIVE_SCAN;
2938                         else
2939 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h
2940 +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
2941 @@ -146,7 +146,7 @@ void rt2x00queue_remove_l2pad(struct sk_
2942   * @local: frame is not from mac80211
2943   */
2944  int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
2945 -                              bool local);
2946 +                              struct ieee80211_sta *sta, bool local);
2947  
2948  /**
2949   * rt2x00queue_update_beacon - Send new beacon from mac80211
2950 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c
2951 +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
2952 @@ -90,7 +90,7 @@ static int rt2x00mac_tx_rts_cts(struct r
2953                                   frag_skb->data, data_length, tx_info,
2954                                   (struct ieee80211_rts *)(skb->data));
2955  
2956 -       retval = rt2x00queue_write_tx_frame(queue, skb, true);
2957 +       retval = rt2x00queue_write_tx_frame(queue, skb, NULL, true);
2958         if (retval) {
2959                 dev_kfree_skb_any(skb);
2960                 rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
2961 @@ -151,7 +151,7 @@ void rt2x00mac_tx(struct ieee80211_hw *h
2962                         goto exit_fail;
2963         }
2964  
2965 -       if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
2966 +       if (unlikely(rt2x00queue_write_tx_frame(queue, skb, control->sta, false)))
2967                 goto exit_fail;
2968  
2969         /*
2970 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
2971 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
2972 @@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct
2973  }
2974  
2975  int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
2976 -                              bool local)
2977 +                              struct ieee80211_sta *sta, bool local)
2978  {
2979         struct ieee80211_tx_info *tx_info;
2980         struct queue_entry *entry;
2981 @@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct da
2982          * after that we are free to use the skb->cb array
2983          * for our information.
2984          */
2985 -       rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL);
2986 +       rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta);
2987  
2988         /*
2989          * All information is retrieved from the skb->cb array,
2990 --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
2991 +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
2992 @@ -416,7 +416,7 @@ static int rtl8187_init_urbs(struct ieee
2993         struct rtl8187_rx_info *info;
2994         int ret = 0;
2995  
2996 -       while (skb_queue_len(&priv->rx_queue) < 16) {
2997 +       while (skb_queue_len(&priv->rx_queue) < 32) {
2998                 skb = __dev_alloc_skb(RTL8187_MAX_RX, GFP_KERNEL);
2999                 if (!skb) {
3000                         ret = -ENOMEM;
3001 --- a/drivers/net/wireless/rtlwifi/base.c
3002 +++ b/drivers/net/wireless/rtlwifi/base.c
3003 @@ -1078,8 +1078,8 @@ u8 rtl_is_special_data(struct ieee80211_
3004  
3005         ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len +
3006                               SNAP_SIZE + PROTOC_TYPE_SIZE);
3007 -       ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE);
3008 -       /*      ether_type = ntohs(ether_type); */
3009 +       ether_type = be16_to_cpu(*(__be16 *)((u8 *)skb->data + mac_hdr_len +
3010 +                                            SNAP_SIZE));
3011  
3012         if (ETH_P_IP == ether_type) {
3013                 if (IPPROTO_UDP == ip->protocol) {
3014 --- a/drivers/net/wireless/rtlwifi/regd.c
3015 +++ b/drivers/net/wireless/rtlwifi/regd.c
3016 @@ -59,30 +59,27 @@ static struct country_code_to_enum_rd al
3017   */
3018  #define RTL819x_2GHZ_CH12_13   \
3019   &n