ath9k: add fixes for rx processing and baseband hang detection
[openwrt.git] / package / kernel / mac80211 / patches / 300-pending_work.patch
1 commit 98d1a6c5b14688ed030e81b889f607be308e0df9
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date:   Mon Feb 24 22:20:32 2014 +0100
4
5     ath9k: fix invalid descriptor discarding
6     
7     Only set sc->rx.discard_next to rx_stats->rs_more when actually
8     discarding the current descriptor.
9     
10     Also, fix a detection of broken descriptors:
11     First the code checks if the current descriptor is not done.
12     Then it checks if the next descriptor is done.
13     Add a check that afterwards checks the first descriptor again, because
14     it might have been completed in the mean time.
15     
16     This fixes a regression introduced in
17     commit 723e711356b5a8a95728a890e254e8b0d47b55cf
18     "ath9k: fix handling of broken descriptors"
19     
20     Cc: stable@vger.kernel.org
21     Reported-by: Marco André Dinis <marcoandredinis@gmail.com>
22     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
23
24 commit 52a46300e782fe6994466523eb2b0b59091ea59f
25 Author: Felix Fietkau <nbd@openwrt.org>
26 Date:   Mon Feb 24 11:43:50 2014 +0100
27
28     ath9k: reduce baseband hang detection false positive rate
29     
30     Check if the baseband state remains stable, and add a small delay
31     between register reads.
32     
33     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
34
35 commit 118945bb12082e9d4edddc868d88143164e0f440
36 Author: Felix Fietkau <nbd@openwrt.org>
37 Date:   Sat Feb 22 14:55:23 2014 +0100
38
39     ath5k: set SURVEY_INFO_IN_USE on get_survey
40     
41     Only one channel is returned - the one currently being used.
42     
43     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
44
45 commit ee41f72476e1ea44283dfe1cbf75b9543a1e15c8
46 Author: Felix Fietkau <nbd@openwrt.org>
47 Date:   Sat Feb 22 14:44:52 2014 +0100
48
49     ath9k: make some hardware reset log messages debug-only
50     
51     On some chips, baseband watchdog hangs are more common than others, and
52     the driver has support for handling them.
53     Interrupts even after a watchdog hang are also quite common, so there's
54     not much point in spamming the user's logfiles.
55     
56     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
57
58 commit b14fbb554fc65a2e0b5c41a319269b0350f187e7
59 Author: Felix Fietkau <nbd@openwrt.org>
60 Date:   Sat Feb 22 14:35:25 2014 +0100
61
62     ath9k: do not set half/quarter channel flags in AR_PHY_MODE
63     
64     5/10 MHz channel bandwidth is configured via the PLL clock, instead of
65     the AR_PHY_MODE register. Using that register is AR93xx specific, and
66     makes the mode incompatible with earlier chipsets.
67     
68     In some early versions, these flags were apparently applied at the wrong
69     point in time and thus did not cause connectivity issues, however now
70     they are causing problems, as pointed out in this OpenWrt ticket:
71     
72     https://dev.openwrt.org/ticket/14916
73     
74     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
75
76 commit 0f1cb7be2551b30b02cd54c897e0e29e483cfda5
77 Author: Felix Fietkau <nbd@openwrt.org>
78 Date:   Sat Feb 22 13:43:29 2014 +0100
79
80     ath9k: fix ps-poll responses under a-mpdu sessions
81     
82     When passing tx frames to the U-APSD queue for powersave poll responses,
83     the ath_atx_tid pointer needs to be passed to ath_tx_setup_buffer for
84     proper sequence number accounting.
85     
86     This fixes high latency and connection stability issues with ath9k
87     running as AP and a few kinds of mobile phones as client, when PS-Poll
88     is heavily used
89     
90     Cc: stable@vger.kernel.org
91     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
92
93 commit d5d87a37bbd6066b2c3c5d0bd0fe2a6e2ea45cc5
94 Author: Felix Fietkau <nbd@openwrt.org>
95 Date:   Fri Feb 21 11:39:59 2014 +0100
96
97     ath9k: list more reset causes in debugfs
98     
99     Number of MAC hangs and stuck beacons were missing
100     
101     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
102
103 commit d84856012e0f10fe598a5ad3b7b869397a089e07
104 Author: Johannes Berg <johannes.berg@intel.com>
105 Date:   Thu Feb 20 11:19:58 2014 +0100
106
107     mac80211: fix station wakeup powersave race
108     
109     Consider the following (relatively unlikely) scenario:
110      1) station goes to sleep while frames are buffered in driver
111      2) driver blocks wakeup (until no more frames are buffered)
112      3) station wakes up again
113      4) driver unblocks wakeup
114     
115     In this case, the current mac80211 code will do the following:
116      1) WLAN_STA_PS_STA set
117      2) WLAN_STA_PS_DRIVER set
118      3) - nothing -
119      4) WLAN_STA_PS_DRIVER cleared
120     
121     As a result, no frames will be delivered to the client, even
122     though it is awake, until it sends another frame to us that
123     triggers ieee80211_sta_ps_deliver_wakeup() in sta_ps_end().
124     
125     Since we now take the PS spinlock, we can fix this while at
126     the same time removing the complexity with the pending skb
127     queue function. This was broken since my commit 50a9432daeec
128     ("mac80211: fix powersaving clients races") due to removing
129     the clearing of WLAN_STA_PS_STA in the RX path.
130     
131     While at it, fix a cleanup path issue when a station is
132     removed while the driver is still blocking its wakeup.
133     
134     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
135
136 commit 798f2786602cbe93e6b928299614aa36ebf50692
137 Author: Johannes Berg <johannes.berg@intel.com>
138 Date:   Mon Feb 17 20:49:03 2014 +0100
139
140     mac80211: insert stations before adding to driver
141     
142     There's a race condition in mac80211 because we add stations
143     to the internal lists after adding them to the driver, which
144     means that (for example) the following can happen:
145      1. a station connects and is added
146      2. first, it is added to the driver
147      3. then, it is added to the mac80211 lists
148     
149     If the station goes to sleep between steps 2 and 3, and the
150     firmware/hardware records it as being asleep, mac80211 will
151     never instruct the driver to wake it up again as it never
152     realized it went to sleep since the RX path discarded the
153     frame as a "spurious class 3 frame", no station entry was
154     present yet.
155     
156     Fix this by adding the station in software first, and only
157     then adding it to the driver. That way, any state that the
158     driver changes will be reflected properly in mac80211's
159     station state. The problematic part is the roll-back if the
160     driver fails to add the station, in that case a bit more is
161     needed. To not make that overly complex prevent starting BA
162     sessions in the meantime.
163     
164     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
165
166 commit b9ba6a520cb07ab3aa7aaaf9ce4a0bc7a6bc06fe
167 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
168 Date:   Thu Feb 20 09:22:11 2014 +0200
169
170     mac80211: fix AP powersave TX vs. wakeup race
171     
172     There is a race between the TX path and the STA wakeup: while
173     a station is sleeping, mac80211 buffers frames until it wakes
174     up, then the frames are transmitted. However, the RX and TX
175     path are concurrent, so the packet indicating wakeup can be
176     processed while a packet is being transmitted.
177     
178     This can lead to a situation where the buffered frames list
179     is emptied on the one side, while a frame is being added on
180     the other side, as the station is still seen as sleeping in
181     the TX path.
182     
183     As a result, the newly added frame will not be send anytime
184     soon. It might be sent much later (and out of order) when the
185     station goes to sleep and wakes up the next time.
186     
187     Additionally, it can lead to the crash below.
188     
189     Fix all this by synchronising both paths with a new lock.
190     Both path are not fastpath since they handle PS situations.
191     
192     In a later patch we'll remove the extra skb queue locks to
193     reduce locking overhead.
194     
195     BUG: unable to handle kernel
196     NULL pointer dereference at 000000b0
197     IP: [<ff6f1791>] ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
198     *pde = 00000000
199     Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
200     EIP: 0060:[<ff6f1791>] EFLAGS: 00210282 CPU: 1
201     EIP is at ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
202     EAX: e5900da0 EBX: 00000000 ECX: 00000001 EDX: 00000000
203     ESI: e41d00c0 EDI: e5900da0 EBP: ebe458e4 ESP: ebe458b0
204      DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
205     CR0: 8005003b CR2: 000000b0 CR3: 25a78000 CR4: 000407d0
206     DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
207     DR6: ffff0ff0 DR7: 00000400
208     Process iperf (pid: 3934, ti=ebe44000 task=e757c0b0 task.ti=ebe44000)
209     iwlwifi 0000:02:00.0: I iwl_pcie_enqueue_hcmd Sending command LQ_CMD (#4e), seq: 0x0903, 92 bytes at 3[3]:9
210     Stack:
211      e403b32c ebe458c4 00200002 00200286 e403b338 ebe458cc c10960bb e5900da0
212      ff76a6ec ebe458d8 00000000 e41d00c0 e5900da0 ebe458f0 ff6f1b75 e403b210
213      ebe4598c ff723dc1 00000000 ff76a6ec e597c978 e403b758 00000002 00000002
214     Call Trace:
215      [<ff6f1b75>] ieee80211_free_txskb+0x15/0x20 [mac80211]
216      [<ff723dc1>] invoke_tx_handlers+0x1661/0x1780 [mac80211]
217      [<ff7248a5>] ieee80211_tx+0x75/0x100 [mac80211]
218      [<ff7249bf>] ieee80211_xmit+0x8f/0xc0 [mac80211]
219      [<ff72550e>] ieee80211_subif_start_xmit+0x4fe/0xe20 [mac80211]
220      [<c149ef70>] dev_hard_start_xmit+0x450/0x950
221      [<c14b9aa9>] sch_direct_xmit+0xa9/0x250
222      [<c14b9c9b>] __qdisc_run+0x4b/0x150
223      [<c149f732>] dev_queue_xmit+0x2c2/0xca0
224     
225     Cc: stable@vger.kernel.org
226     Reported-by: Yaara Rozenblum <yaara.rozenblum@intel.com>
227     Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
228     Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
229     [reword commit log, use a separate lock]
230     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
231
232 commit 80e419de0dff38436b30d363311c625766193f86
233 Author: Inbal Hacohen <Inbal.Hacohen@intel.com>
234 Date:   Wed Feb 12 09:32:27 2014 +0200
235
236     cfg80211: bugfix in regulatory user hint process
237     
238     After processing hint_user, we would want to schedule the
239     timeout work only if we are actually waiting to CRDA. This happens
240     when the status is not "IGNORE" nor "ALREADY_SET".
241     
242     Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
243     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
244
245 commit 6514c93afede55284e2cb63359aadedb85884c80
246 Author: Jouni Malinen <jouni@qca.qualcomm.com>
247 Date:   Tue Feb 18 20:41:08 2014 +0200
248
249     ath9k: Enable U-APSD AP mode support
250     
251     mac80211 handles the actual operations, so ath9k can just indicate
252     support for this. Based on initial tests, this combination seems to
253     work fine.
254     
255     Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
256
257 commit a63caf0a357ad5c1f08d6b7827dc76c451445017
258 Author: Stanislaw Gruszka <sgruszka@redhat.com>
259 Date:   Wed Feb 19 13:15:17 2014 +0100
260
261     ath9k: protect tid->sched check
262     
263     We check tid->sched without a lock taken on ath_tx_aggr_sleep(). That
264     is race condition which can result of doing list_del(&tid->list) twice
265     (second time with poisoned list node) and cause crash like shown below:
266     
267     [424271.637220] BUG: unable to handle kernel paging request at 00100104
268     [424271.637328] IP: [<f90fc072>] ath_tx_aggr_sleep+0x62/0xe0 [ath9k]
269     ...
270     [424271.639953] Call Trace:
271     [424271.639998]  [<f90f6900>] ? ath9k_get_survey+0x110/0x110 [ath9k]
272     [424271.640083]  [<f90f6942>] ath9k_sta_notify+0x42/0x50 [ath9k]
273     [424271.640177]  [<f809cfef>] sta_ps_start+0x8f/0x1c0 [mac80211]
274     [424271.640258]  [<c10f730e>] ? free_compound_page+0x2e/0x40
275     [424271.640346]  [<f809e915>] ieee80211_rx_handlers+0x9d5/0x2340 [mac80211]
276     [424271.640437]  [<c112f048>] ? kmem_cache_free+0x1d8/0x1f0
277     [424271.640510]  [<c1345a84>] ? kfree_skbmem+0x34/0x90
278     [424271.640578]  [<c10fc23c>] ? put_page+0x2c/0x40
279     [424271.640640]  [<c1345a84>] ? kfree_skbmem+0x34/0x90
280     [424271.640706]  [<c1345a84>] ? kfree_skbmem+0x34/0x90
281     [424271.640787]  [<f809dde3>] ? ieee80211_rx_handlers_result+0x73/0x1d0 [mac80211]
282     [424271.640897]  [<f80a07a0>] ieee80211_prepare_and_rx_handle+0x520/0xad0 [mac80211]
283     [424271.641009]  [<f809e22d>] ? ieee80211_rx_handlers+0x2ed/0x2340 [mac80211]
284     [424271.641104]  [<c13846ce>] ? ip_output+0x7e/0xd0
285     [424271.641182]  [<f80a1057>] ieee80211_rx+0x307/0x7c0 [mac80211]
286     [424271.641266]  [<f90fa6ee>] ath_rx_tasklet+0x88e/0xf70 [ath9k]
287     [424271.641358]  [<f80a0f2c>] ? ieee80211_rx+0x1dc/0x7c0 [mac80211]
288     [424271.641445]  [<f90f82db>] ath9k_tasklet+0xcb/0x130 [ath9k]
289     
290     Bug report:
291     https://bugzilla.kernel.org/show_bug.cgi?id=70551
292     
293     Reported-and-tested-by: Max Sydorenko <maxim.stargazer@gmail.com>
294     Cc: stable@vger.kernel.org
295     Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
296
297 commit 82ed9e3ccc02797df2ffe4b78127c4cd5f799a41
298 Author: Felix Fietkau <nbd@openwrt.org>
299 Date:   Tue Feb 11 15:54:13 2014 +0100
300
301     mac80211: send control port protocol frames to the VO queue
302     
303     Improves reliability of wifi connections with WPA, since authentication
304     frames are prioritized over normal traffic and also typically exempt
305     from aggregation.
306     
307     Cc: stable@vger.kernel.org
308     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
309
310 commit d4426800f71e972feaa33e04c5801fc730627bdd
311 Author: Stanislaw Gruszka <stf_xl@wp.pl>
312 Date:   Mon Feb 10 22:38:28 2014 +0100
313
314     rtl8187: fix regression on MIPS without coherent DMA
315     
316     This patch fixes regression caused by commit a16dad77634 "MIPS: Fix
317     potencial corruption". That commit fixes one corruption scenario in
318     cost of adding another one, which actually start to cause crashes
319     on Yeeloong laptop when rtl8187 driver is used.
320     
321     For correct DMA read operation on machines without DMA coherence, kernel
322     have to invalidate cache, such it will refill later with new data that
323     device wrote to memory, when that data is needed to process. We can only
324     invalidate full cache line. Hence when cache line includes both dma
325     buffer and some other data (written in cache, but not yet in main
326     memory), the other data can not hit memory due to invalidation. That
327     happen on rtl8187 where struct rtl8187_priv fields are located just
328     before and after small buffers that are passed to USB layer and DMA
329     is performed on them.
330     
331     To fix the problem we align buffers and reserve space after them to make
332     them match cache line.
333     
334     This patch does not resolve all possible MIPS problems entirely, for
335     that we have to assure that we always map cache aligned buffers for DMA,
336     what can be complex or even not possible. But patch fixes visible and
337     reproducible regression and seems other possible corruptions do not
338     happen in practice, since Yeeloong laptop works stable without rtl8187
339     driver.
340     
341     Bug report:
342     https://bugzilla.kernel.org/show_bug.cgi?id=54391
343     
344     Reported-by: Petr Pisar <petr.pisar@atlas.cz>
345     Bisected-by: Tom Li <biergaizi2009@gmail.com>
346     Reported-and-tested-by: Tom Li <biergaizi2009@gmail.com>
347     Cc: stable@vger.kernel.org
348     Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
349
350 commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
351 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
352 Date:   Fri Feb 7 10:29:55 2014 +0530
353
354     ath9k: Calculate IQ-CAL median
355     
356     This patch adds a routine to calculate the median IQ correction
357     values for AR955x, which is used for outlier detection.
358     The normal method which is used for all other chips is
359     bypassed for AR955x.
360     
361     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
362
363 commit c52a6fce0820c8d0687443ab86058ae03b478c8f
364 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
365 Date:   Fri Feb 7 10:29:54 2014 +0530
366
367     ath9k: Expand the IQ coefficient array
368     
369     This will be used for storing data for mutiple
370     IQ calibration runs, for AR955x.
371     
372     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
373
374 commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
375 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
376 Date:   Fri Feb 7 10:29:53 2014 +0530
377
378     ath9k: Modify IQ calibration for AR955x
379     
380     IQ calibration post-processing for AR955x is different
381     from other chips - instead of just doing it as part
382     of AGC calibration once, it is triggered 3 times and
383     a median is determined. This patch adds initial support
384     for changing the calibration behavior for AR955x.
385     
386     Also, to simplify things, a helper routine to issue/poll
387     AGC calibration is used.
388     
389     For non-AR955x chips, the iqcal_idx (which will be used
390     in subsequent patches) is set to zero.
391     
392     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
393
394 commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
395 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
396 Date:   Fri Feb 7 10:29:52 2014 +0530
397
398     ath9k: Fix magnitude/phase calculation
399     
400     Incorrect values are programmed in the registers
401     containing the IQ correction coefficients by the IQ-CAL
402     post-processing code. Fix this.
403     
404     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
405
406 commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
407 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
408 Date:   Fri Feb 7 10:29:51 2014 +0530
409
410     ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
411     
412     Use ar9003_hw_tx_iq_cal_outlier_detection instead.
413     
414     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
415
416 commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
417 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
418 Date:   Fri Feb 7 10:29:50 2014 +0530
419
420     ath9k: Check explicitly for IQ calibration
421     
422     In chips like AR955x, the initvals contain the information
423     whether IQ calibration is to be done in the HW when an
424     AGC calibration is triggered. Check if IQ-CAL is enabled
425     in the initvals before flagging 'txiqcal_done' as true.
426     
427     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
428
429 commit cb4969634b93c4643a32cc3fbd27d2b288b25771
430 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
431 Date:   Fri Feb 7 10:29:49 2014 +0530
432
433     ath9k: Fix IQ cal post processing for SoC
434     
435     Calibration data is not reused for SoC chips, so
436     call ar9003_hw_tx_iq_cal_post_proc() with the correct
437     argument. The 'is_reusable' flag is currently used
438     only for PC-OEM chips, but it makes things clearer to
439     specify it explicity.
440     
441     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
442
443 commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
444 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
445 Date:   Mon Feb 3 13:31:37 2014 +0530
446
447     ath9k: Fix TX power calculation
448     
449     The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
450     fixed the incorrect values in the eeprom templates, but if
451     boards have already been calibrated with incorrect values,
452     they would still be using the wrong TX power. Fix this by assigning
453     a default value in such cases.
454     
455     Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
456     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
457
458 commit b9f268b5b01331c3c82179abca551429450e9417
459 Author: Michal Kazior <michal.kazior@tieto.com>
460 Date:   Wed Jan 29 14:22:27 2014 +0100
461
462     cfg80211: consider existing DFS interfaces
463     
464     It was possible to break interface combinations in
465     the following way:
466     
467      combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
468      combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
469     
470     With the above interface combinations it was
471     possible to:
472     
473      step 1. start AP on DFS channel by matching combo 2
474      step 2. start AP on non-DFS channel by matching combo 1
475     
476     This was possible beacuse (step 2) did not consider
477     if other interfaces require radar detection.
478     
479     The patch changes how cfg80211 tracks channels -
480     instead of channel itself now a complete chandef
481     is stored.
482     
483     Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
484     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
485
486 commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
487 Author: Antonio Quartulli <antonio@open-mesh.com>
488 Date:   Wed Jan 29 17:53:43 2014 +0100
489
490     cfg80211: fix channel configuration in IBSS join
491     
492     When receiving an IBSS_JOINED event select the BSS object
493     based on the {bssid, channel} couple rather than the bssid
494     only.
495     With the current approach if another cell having the same
496     BSSID (but using a different channel) exists then cfg80211
497     picks up the wrong BSS object.
498     The result is a mismatching channel configuration between
499     cfg80211 and the driver, that can lead to any sort of
500     problem.
501     
502     The issue can be triggered by having an IBSS sitting on
503     given channel and then asking the driver to create a new
504     cell using the same BSSID but with a different frequency.
505     By passing the channel to cfg80211_get_bss() we can solve
506     this ambiguity and retrieve/create the correct BSS object.
507     All the users of cfg80211_ibss_joined() have been changed
508     accordingly.
509     
510     Moreover WARN when cfg80211_ibss_joined() gets a NULL
511     channel as argument and remove a bogus call of the same
512     function in ath6kl (it does not make sense to call
513     cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
514     
515     Cc: Kalle Valo <kvalo@qca.qualcomm.com>
516     Cc: Arend van Spriel <arend@broadcom.com>
517     Cc: Bing Zhao <bzhao@marvell.com>
518     Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
519     Cc: libertas-dev@lists.infradead.org
520     Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
521     Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
522     [minor code cleanup in ath6kl]
523     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
524
525 commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
526 Author: Johannes Berg <johannes.berg@intel.com>
527 Date:   Fri Jan 24 14:41:44 2014 +0100
528
529     mac80211: fix bufferable MMPDU RX handling
530     
531     Action, disassoc and deauth frames are bufferable, and as such don't
532     have the PM bit in the frame control field reserved which means we
533     need to react to the bit when receiving in such a frame.
534     
535     Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
536     and using it for the RX path that currently ignores the PM bit in
537     any non-data frames for doze->wake transitions, but listens to it in
538     all frames for wake->doze transitions, both of which are wrong.
539     
540     Also use the new helper in the TX path to clean up the code.
541     
542     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
543
544 commit fc0df6d2343636e3f48a069330d5b972e3d8659d
545 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
546 Date:   Fri Jan 24 14:29:21 2014 +0100
547
548     cfg80211: set preset_chandef after channel switch
549     
550     Set preset_chandef in channel switch notification.
551     In other case we will have old preset_chandef.
552     
553     Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
554     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
555
556 commit cdec895e2344987ff171cece96e25d7407a3ebf6
557 Author: Simon Wunderlich <simon@open-mesh.com>
558 Date:   Fri Jan 24 23:48:29 2014 +0100
559
560     mac80211: send ibss probe responses with noack flag
561     
562     Responding to probe requests for scanning clients will often create
563     excessive retries, as it happens quite often that the scanning client
564     already left the channel. Therefore do it like hostapd and send probe
565     responses for wildcard SSID only once by using the noack flag.
566     
567     Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
568     [fix typo & 'wildcard SSID' in commit log]
569     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
570
571 commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
572 Author: Luciano Coelho <luciano.coelho@intel.com>
573 Date:   Tue Jan 28 17:09:08 2014 +0200
574
575     mac80211: ibss: remove unnecessary call to release channel
576     
577     The ieee80211_vif_use_channel() function calls
578     ieee80211_vif_release_channel(), so there's no need to call it
579     explicitly in __ieee80211_sta_join_ibss().
580     
581     Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
582     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
583
584 commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
585 Author: Michal Kazior <michal.kazior@tieto.com>
586 Date:   Wed Jan 29 07:56:21 2014 +0100
587
588     mac80211: add missing CSA locking
589     
590     The patch adds a missing sdata lock and adds a few
591     lockdeps for easier maintenance.
592     
593     Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
594     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
595
596 commit ad17ba7d14d225b109b73c177cd446afb8050598
597 Author: Michal Kazior <michal.kazior@tieto.com>
598 Date:   Wed Jan 29 07:56:20 2014 +0100
599
600     mac80211: fix sdata->radar_required locking
601     
602     radar_required setting wasn't protected by
603     local->mtx in some places. This should prevent
604     from scanning/radar detection/roc colliding.
605     
606     Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
607     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
608
609 commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
610 Author: Michal Kazior <michal.kazior@tieto.com>
611 Date:   Wed Jan 29 07:56:19 2014 +0100
612
613     mac80211: move csa_active setting in STA CSA
614     
615     The sdata->vif.csa_active could be left set after,
616     e.g. channel context constraints check fail in STA
617     mode leaving the interface in a strange state for
618     a brief period of time until it is disconnected.
619     This was harmless but ugly.
620     
621     Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
622     Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
623     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
624
625 commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
626 Author: Michal Kazior <michal.kazior@tieto.com>
627 Date:   Wed Jan 29 07:56:18 2014 +0100
628
629     mac80211: fix possible memory leak on AP CSA failure
630     
631     If CSA for AP interface failed and the interface
632     was not stopped afterwards another CSA request
633     would leak sdata->u.ap.next_beacon.
634     
635     Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
636     Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
637     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
638
639 commit 3a77ba08940682bf3d52cf14f980337324af9d4a
640 Author: Johannes Berg <johannes.berg@intel.com>
641 Date:   Sat Feb 1 00:33:29 2014 +0100
642
643     mac80211: fix fragmentation code, particularly for encryption
644     
645     The "new" fragmentation code (since my rewrite almost 5 years ago)
646     erroneously sets skb->len rather than using skb_trim() to adjust
647     the length of the first fragment after copying out all the others.
648     This leaves the skb tail pointer pointing to after where the data
649     originally ended, and thus causes the encryption MIC to be written
650     at that point, rather than where it belongs: immediately after the
651     data.
652     
653     The impact of this is that if software encryption is done, then
654      a) encryption doesn't work for the first fragment, the connection
655         becomes unusable as the first fragment will never be properly
656         verified at the receiver, the MIC is practically guaranteed to
657         be wrong
658      b) we leak up to 8 bytes of plaintext (!) of the packet out into
659         the air
660     
661     This is only mitigated by the fact that many devices are capable
662     of doing encryption in hardware, in which case this can't happen
663     as the tail pointer is irrelevant in that case. Additionally,
664     fragmentation is not used very frequently and would normally have
665     to be configured manually.
666     
667     Fix this by using skb_trim() properly.
668     
669     Cc: stable@vger.kernel.org
670     Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
671     Reported-by: Jouni Malinen <j@w1.fi>
672     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
673
674 commit de5f242e0c10e841017e37eb8c38974a642dbca8
675 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
676 Date:   Tue Jan 28 06:21:59 2014 +0530
677
678     ath9k: Fix build error on ARM
679     
680     Use mdelay instead of udelay to fix this error:
681     
682     ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
683     make[1]: *** [__modpost] Error 1
684     make: *** [modules] Error 2
685     
686     Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
687     Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
688
689 commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
690 Author: Geert Uytterhoeven <geert@linux-m68k.org>
691 Date:   Sun Jan 26 11:53:21 2014 +0100
692
693     ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
694     
695     drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
696     drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
697     
698     Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
699     optimize ath9k_flush").
700     
701     Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
702
703 commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
704 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
705 Date:   Mon Jan 27 11:07:42 2014 +0200
706
707     mac80211: release the channel in error path in start_ap
708     
709     When the driver cannot start the AP or when the assignement
710     of the beacon goes wrong, we need to unassign the vif.
711     
712     Cc: stable@vger.kernel.org
713     Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
714     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
715
716 commit dfb6889a75c601aedb7450b7e606668e77da6679
717 Author: Johannes Berg <johannes.berg@intel.com>
718 Date:   Wed Jan 22 11:14:19 2014 +0200
719
720     cfg80211: send scan results from work queue
721     
722     Due to the previous commit, when a scan finishes, it is in theory
723     possible to hit the following sequence:
724      1. interface starts being removed
725      2. scan is cancelled by driver and cfg80211 is notified
726      3. scan done work is scheduled
727      4. interface is removed completely, rdev->scan_req is freed,
728         event sent to userspace but scan done work remains pending
729      5. new scan is requested on another virtual interface
730      6. scan done work runs, freeing the still-running scan
731     
732     To fix this situation, hang on to the scan done message and block
733     new scans while that is the case, and only send the message from
734     the work function, regardless of whether the scan_req is already
735     freed from interface removal. This makes step 5 above impossible
736     and changes step 6 to be
737      5. scan done work runs, sending the scan done message
738     
739     As this can't work for wext, so we send the message immediately,
740     but this shouldn't be an issue since we still return -EBUSY.
741     
742     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
743
744 commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
745 Author: Johannes Berg <johannes.berg@intel.com>
746 Date:   Wed Jan 22 11:14:18 2014 +0200
747
748     cfg80211: fix scan done race
749     
750     When an interface/wdev is removed, any ongoing scan should be
751     cancelled by the driver. This will make it call cfg80211, which
752     only queues a work struct. If interface/wdev removal is quick
753     enough, this can leave the scan request pending and processed
754     only after the interface is gone, causing a use-after-free.
755     
756     Fix this by making sure the scan request is not pending after
757     the interface is destroyed. We can't flush or cancel the work
758     item due to locking concerns, but when it'll run it shouldn't
759     find anything to do. This leaves a potential issue, if a new
760     scan gets requested before the work runs, it prematurely stops
761     the running scan, potentially causing another crash. I'll fix
762     that in the next patch.
763     
764     This was particularly observed with P2P_DEVICE wdevs, likely
765     because freeing them is quicker than freeing netdevs.
766     
767     Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
768     Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
769     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
770
771 commit ae04fa489ab31b5a10d3cc8399f52761175d4321
772 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
773 Date:   Thu Jan 23 14:28:16 2014 +0200
774
775     mac80211: avoid deadlock revealed by lockdep
776     
777     sdata->u.ap.request_smps_work can’t be flushed synchronously
778     under wdev_lock(wdev) since ieee80211_request_smps_ap_work
779     itself locks the same lock.
780     While at it, reset the driver_smps_mode when the ap is
781     stopped to its default: OFF.
782     
783     This solves:
784     
785     ======================================================
786     [ INFO: possible circular locking dependency detected ]
787     3.12.0-ipeer+ #2 Tainted: G           O
788     -------------------------------------------------------
789     rmmod/2867 is trying to acquire lock:
790       ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
791     
792     but task is already holding lock:
793       (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
794     
795     which lock already depends on the new lock.
796     
797     the existing dependency chain (in reverse order) is:
798     
799     -> #1 (&wdev->mtx){+.+.+.}:
800             [<c10aefa9>] lock_acquire+0x79/0xe0
801             [<c1607a1a>] mutex_lock_nested+0x4a/0x360
802             [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
803             [<c105cdd8>] process_one_work+0x198/0x450
804             [<c105d469>] worker_thread+0xf9/0x320
805             [<c10669ff>] kthread+0x9f/0xb0
806             [<c1613397>] ret_from_kernel_thread+0x1b/0x28
807     
808     -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
809             [<c10ae9df>] __lock_acquire+0x183f/0x1910
810             [<c10aefa9>] lock_acquire+0x79/0xe0
811             [<c105b917>] flush_work+0x47/0x90
812             [<c105d867>] __cancel_work_timer+0x67/0xe0
813             [<c105d90f>] cancel_work_sync+0xf/0x20
814             [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
815             [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
816             [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
817             [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
818             [<c160f2c9>] notifier_call_chain+0x59/0x130
819             [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
820             [<c106c70f>] raw_notifier_call_chain+0x1f/0x30
821             [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
822             [<c14f8263>] call_netdevice_notifiers+0x13/0x20
823             [<c14f82a4>] __dev_close_many+0x34/0xb0
824             [<c14f83fe>] dev_close_many+0x6e/0xc0
825             [<c14f9c77>] rollback_registered_many+0xa7/0x1f0
826             [<c14f9dd4>] unregister_netdevice_many+0x14/0x60
827             [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
828             [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
829             [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
830             [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
831             [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
832             [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
833             [<c10b8bf9>] SyS_delete_module+0x179/0x2b0
834             [<c1613421>] sysenter_do_call+0x12/0x32
835     
836     Fixes: 687da132234f ("mac80211: implement SMPS for AP")
837     Cc: <stable@vger.kernel.org> [3.13]
838     Reported-by: Ilan Peer <ilan.peer@intel.com>
839     Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
840     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
841
842 commit 178b205e96217164fd7c30113464250d0b6f5eca
843 Author: Johannes Berg <johannes.berg@intel.com>
844 Date:   Thu Jan 23 16:32:29 2014 +0100
845
846     cfg80211: re-enable 5/10 MHz support
847     
848     Unfortunately I forgot this during the merge window, but the
849     patch seems small enough to go in as a fix. The userspace API
850     bug that was the reason for disabling it has long been fixed.
851     
852     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
853
854 commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
855 Author: Pontus Fuchs <pontus.fuchs@gmail.com>
856 Date:   Thu Jan 16 15:00:40 2014 +0100
857
858     nl80211: Reset split_start when netlink skb is exhausted
859     
860     When the netlink skb is exhausted split_start is left set. In the
861     subsequent retry, with a larger buffer, the dump is continued from the
862     failing point instead of from the beginning.
863     
864     This was causing my rt28xx based USB dongle to now show up when
865     running "iw list" with an old iw version without split dump support.
866     
867     Cc: stable@vger.kernel.org
868     Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
869     Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
870     [avoid the entire workaround when state->split is set]
871     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
872
873 commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
874 Author: Eliad Peller <eliad@wizery.com>
875 Date:   Sun Jan 12 11:06:37 2014 +0200
876
877     mac80211: move roc cookie assignment earlier
878     
879     ieee80211_start_roc_work() might add a new roc
880     to existing roc, and tell cfg80211 it has already
881     started.
882     
883     However, this might happen before the roc cookie
884     was set, resulting in REMAIN_ON_CHANNEL (started)
885     event with null cookie. Consequently, it can make
886     wpa_supplicant go out of sync.
887     
888     Fix it by setting the roc cookie earlier.
889     
890     Cc: stable@vger.kernel.org
891     Signed-off-by: Eliad Peller <eliad@wizery.com>
892     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
893
894 commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
895 Author: Johannes Berg <johannes.berg@intel.com>
896 Date:   Fri Jan 24 14:06:29 2014 +0100
897
898     nl80211: send event when AP operation is stopped
899     
900     There are a few cases, e.g. suspend, where an AP interface is
901     stopped by the kernel rather than by userspace request, most
902     commonly when suspending. To let userspace know about this,
903     send the NL80211_CMD_STOP_AP command as an event every time
904     an AP interface is stopped. This also happens when userspace
905     did in fact request the AP stop, but that's not a problem.
906     
907     For full-MAC drivers this may need to be extended to also
908     cover cases where the device stopped the AP operation for
909     some reason, this a bit more complicated because then all
910     cfg80211 state also needs to be reset; such API is not part
911     of this patch.
912     
913     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
914
915 commit d5d567eda7704f190379ca852a8f9a4112e3eee3
916 Author: Johannes Berg <johannes.berg@intel.com>
917 Date:   Thu Jan 23 16:20:29 2014 +0100
918
919     mac80211: add length check in ieee80211_is_robust_mgmt_frame()
920     
921     A few places weren't checking that the frame passed to the
922     function actually has enough data even though the function
923     clearly documents it must have a payload byte. Make this
924     safer by changing the function to take an skb and checking
925     the length inside. The old version is preserved for now as
926     the rtl* drivers use it and don't have a correct skb.
927     
928     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
929
930 commit f8f6d212a047fc65c7d3442dfc038f65517236fc
931 Author: Johannes Berg <johannes.berg@intel.com>
932 Date:   Fri Jan 24 10:53:53 2014 +0100
933
934     nl80211: fix scheduled scan RSSI matchset attribute confusion
935     
936     The scheduled scan matchsets were intended to be a list of filters,
937     with the found BSS having to pass at least one of them to be passed
938     to the host. When the RSSI attribute was added, however, this was
939     broken and currently wpa_supplicant adds that attribute in its own
940     matchset; however, it doesn't intend that to mean that anything
941     that passes the RSSI filter should be passed to the host, instead
942     it wants it to mean that everything needs to also have higher RSSI.
943     
944     This is semantically problematic because we have a list of filters
945     like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
946     one should be OR'ed and which one AND'ed.
947     
948     To fix this, move the RSSI filter attribute into each matchset. As
949     we need to stay backward compatible, treat a matchset with only the
950     RSSI attribute as a "default RSSI filter" for all other matchsets,
951     but only if there are other matchsets (an RSSI-only matchset by
952     itself is still desirable.)
953     
954     To make driver implementation easier, keep a global min_rssi_thold
955     for the entire request as well. The only affected driver is ath6kl.
956     
957     I found this when I looked into the code after Raja Mani submitted
958     a patch fixing the n_match_sets calculation to disregard the RSSI,
959     but that patch didn't address the semantic issue.
960     
961     Reported-by: Raja Mani <rmani@qti.qualcomm.com>
962     Acked-by: Luciano Coelho <luciano.coelho@intel.com>
963     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
964
965 commit de553e8545e65a6dc4e45f43df7e1443d4291922
966 Author: Johannes Berg <johannes.berg@intel.com>
967 Date:   Fri Jan 24 10:17:47 2014 +0100
968
969     nl80211: check nla_parse() return values
970     
971     If there's a policy, then nla_parse() return values must be
972     checked, otherwise the policy is useless and there's nothing
973     that ensures the attributes are actually what we expect them
974     to be.
975     
976     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
977
978 commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
979 Author: Karl Beldan <karl.beldan@rivierawaves.com>
980 Date:   Thu Jan 23 20:06:34 2014 +0100
981
982     mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
983     
984     ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
985     the BA parameters. In the discussion [1] about this patch, Johannes
986     recalled that it fixed some races with the DELBA and indeed this
987     behavior was introduced in [2].
988     While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
989     their BA params TID AC violates the spec and is more a workaround for
990     some drivers. Helmut expressed some concerns wrt such drivers, in
991     particular DELBAs in rt2x00.
992     
993     ATM, DELBAs are sent after a driver has called (hence "purposely")
994     ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
995     details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
996     given to the driver ampdu_action supposed to call this function, which
997     could prove handy to people trying to do the right thing in faulty
998     drivers (if their fw/hw don't get in their way).
999     
1000     [1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
1001     [2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
1002     
1003     Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
1004     Cc: Helmut Schaa <helmut.schaa@googlemail.com>
1005     Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
1006     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1007 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
1008 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
1009 @@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
1010         if (nw_type & ADHOC_NETWORK) {
1011                 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
1012                            nw_type & ADHOC_CREATOR ? "creator" : "joiner");
1013 -               cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1014 +               cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
1015                 cfg80211_put_bss(ar->wiphy, bss);
1016                 return;
1017         }
1018 @@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
1019         }
1020  
1021         if (vif->nw_type & ADHOC_NETWORK) {
1022 -               if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
1023 +               if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
1024                         ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
1025                                    "%s: ath6k not in ibss mode\n", __func__);
1026 -                       return;
1027 -               }
1028 -               memset(bssid, 0, ETH_ALEN);
1029 -               cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1030                 return;
1031         }
1032  
1033 @@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
1034         struct ath6kl_vif *vif = netdev_priv(dev);
1035         u16 interval;
1036         int ret, rssi_thold;
1037 +       int n_match_sets = request->n_match_sets;
1038 +
1039 +       /*
1040 +        * If there's a matchset w/o an SSID, then assume it's just for
1041 +        * the RSSI (nothing else is currently supported) and ignore it.
1042 +        * The device only supports a global RSSI filter that we set below.
1043 +        */
1044 +       if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
1045 +               n_match_sets = 0;
1046  
1047         if (ar->state != ATH6KL_STATE_ON)
1048                 return -EIO;
1049 @@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
1050         ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
1051                                       request->n_ssids,
1052                                       request->match_sets,
1053 -                                     request->n_match_sets);
1054 +                                     n_match_sets);
1055         if (ret < 0)
1056                 return ret;
1057  
1058 -       if (!request->n_match_sets) {
1059 +       if (!n_match_sets) {
1060                 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
1061                                                ALL_BSS_FILTER, 0);
1062                 if (ret < 0)
1063 @@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
1064  
1065         if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
1066                      ar->fw_capabilities)) {
1067 -               if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1068 +               if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1069                         rssi_thold = 0;
1070 -               else if (request->rssi_thold < -127)
1071 +               else if (request->min_rssi_thold < -127)
1072                         rssi_thold = -127;
1073                 else
1074 -                       rssi_thold = request->rssi_thold;
1075 +                       rssi_thold = request->min_rssi_thold;
1076  
1077                 ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
1078                                                      rssi_thold);
1079 --- a/drivers/net/wireless/ath/ath9k/hw.c
1080 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1081 @@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
1082         if (AR_SREV_9300_20_OR_LATER(ah))
1083                 udelay(50);
1084         else if (AR_SREV_9100(ah))
1085 -               udelay(10000);
1086 +               mdelay(10);
1087         else
1088                 udelay(100);
1089  
1090 @@ -1534,7 +1534,7 @@ EXPORT_SYMBOL(ath9k_hw_check_nav);
1091  bool ath9k_hw_check_alive(struct ath_hw *ah)
1092  {
1093         int count = 50;
1094 -       u32 reg;
1095 +       u32 reg, last_val;
1096  
1097         if (AR_SREV_9300(ah))
1098                 return !ath9k_hw_detect_mac_hang(ah);
1099 @@ -1542,9 +1542,13 @@ bool ath9k_hw_check_alive(struct ath_hw 
1100         if (AR_SREV_9285_12_OR_LATER(ah))
1101                 return true;
1102  
1103 +       last_val = REG_READ(ah, AR_OBS_BUS_1);
1104         do {
1105                 reg = REG_READ(ah, AR_OBS_BUS_1);
1106 +               if (reg != last_val)
1107 +                       return true;
1108  
1109 +               last_val = reg;
1110                 if ((reg & 0x7E7FFFEF) == 0x00702400)
1111                         continue;
1112  
1113 @@ -1556,6 +1560,8 @@ bool ath9k_hw_check_alive(struct ath_hw 
1114                 default:
1115                         return true;
1116                 }
1117 +
1118 +               udelay(1);
1119         } while (count-- > 0);
1120  
1121         return false;
1122 @@ -2051,9 +2057,8 @@ static bool ath9k_hw_set_power_awake(str
1123  
1124         REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
1125                     AR_RTC_FORCE_WAKE_EN);
1126 -
1127         if (AR_SREV_9100(ah))
1128 -               udelay(10000);
1129 +               mdelay(10);
1130         else
1131                 udelay(50);
1132  
1133 --- a/drivers/net/wireless/ath/ath9k/main.c
1134 +++ b/drivers/net/wireless/ath/ath9k/main.c
1135 @@ -451,7 +451,7 @@ void ath9k_tasklet(unsigned long data)
1136                  * interrupts are enabled in the reset routine.
1137                  */
1138                 atomic_inc(&ah->intr_ref_cnt);
1139 -               ath_dbg(common, ANY, "FATAL: Skipping interrupts\n");
1140 +               ath_dbg(common, RESET, "FATAL: Skipping interrupts\n");
1141                 goto out;
1142         }
1143  
1144 @@ -471,7 +471,7 @@ void ath9k_tasklet(unsigned long data)
1145                          * interrupts are enabled in the reset routine.
1146                          */
1147                         atomic_inc(&ah->intr_ref_cnt);
1148 -                       ath_dbg(common, ANY,
1149 +                       ath_dbg(common, RESET,
1150                                 "BB_WATCHDOG: Skipping interrupts\n");
1151                         goto out;
1152                 }
1153 @@ -484,7 +484,7 @@ void ath9k_tasklet(unsigned long data)
1154                         type = RESET_TYPE_TX_GTT;
1155                         ath9k_queue_reset(sc, type);
1156                         atomic_inc(&ah->intr_ref_cnt);
1157 -                       ath_dbg(common, ANY,
1158 +                       ath_dbg(common, RESET,
1159                                 "GTT: Skipping interrupts\n");
1160                         goto out;
1161                 }
1162 @@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
1163  
1164  static bool ath9k_has_tx_pending(struct ath_softc *sc)
1165  {
1166 -       int i, npend;
1167 +       int i, npend = 0;
1168  
1169         for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1170                 if (!ATH_TXQ_SETUP(sc, i))
1171 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
1172 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
1173 @@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
1174          * config match list.
1175          */
1176         for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
1177 +               /* skip empty SSID matchsets */
1178 +               if (!req->match_sets[i].ssid.ssid_len)
1179 +                       continue;
1180                 scan->direct_scan[i].id = WLAN_EID_SSID;
1181                 scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
1182                 memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
1183 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1184 +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1185 @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
1186                         /* During testing, hdr was NULL */
1187                         return false;
1188                 }
1189 -               if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1190 +               if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1191                     (ieee80211_has_protected(hdr->frame_control)))
1192                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
1193                 else
1194 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1195 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1196 @@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
1197                         /* In testing, hdr was NULL here */
1198                         return false;
1199                 }
1200 -               if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1201 +               if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1202                     (ieee80211_has_protected(hdr->frame_control)))
1203                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
1204                 else
1205 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1206 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1207 @@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
1208                         /* during testing, hdr was NULL here */
1209                         return false;
1210                 }
1211 -               if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1212 +               if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1213                         (ieee80211_has_protected(hdr->frame_control)))
1214                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
1215                 else
1216 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1217 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1218 @@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
1219                         /* during testing, hdr could be NULL here */
1220                         return false;
1221                 }
1222 -               if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1223 +               if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1224                         (ieee80211_has_protected(hdr->frame_control)))
1225                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
1226                 else
1227 --- a/include/linux/ieee80211.h
1228 +++ b/include/linux/ieee80211.h
1229 @@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
1230  }
1231  
1232  /**
1233 + * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
1234 + * @fc: frame control field in little-endian byteorder
1235 + */
1236 +static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
1237 +{
1238 +       /* IEEE 802.11-2012, definition of "bufferable management frame";
1239 +        * note that this ignores the IBSS special case. */
1240 +       return ieee80211_is_mgmt(fc) &&
1241 +              (ieee80211_is_action(fc) ||
1242 +               ieee80211_is_disassoc(fc) ||
1243 +               ieee80211_is_deauth(fc));
1244 +}
1245 +
1246 +/**
1247   * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
1248   * @seq_ctrl: frame sequence control bytes in little-endian byteorder
1249   */
1250 @@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
1251  }
1252  
1253  /**
1254 - * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1255 + * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1256   * @hdr: the frame (buffer must include at least the first octet of payload)
1257   */
1258 -static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1259 +static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1260  {
1261         if (ieee80211_is_disassoc(hdr->frame_control) ||
1262             ieee80211_is_deauth(hdr->frame_control))
1263 @@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
1264  }
1265  
1266  /**
1267 + * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
1268 + * @skb: the skb containing the frame, length will be checked
1269 + */
1270 +static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
1271 +{
1272 +       if (skb->len < 25)
1273 +               return false;
1274 +       return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
1275 +}
1276 +
1277 +/**
1278   * ieee80211_is_public_action - check if frame is a public action frame
1279   * @hdr: the frame
1280   * @len: length of the frame
1281 --- a/include/net/cfg80211.h
1282 +++ b/include/net/cfg80211.h
1283 @@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
1284   * struct cfg80211_match_set - sets of attributes to match
1285   *
1286   * @ssid: SSID to be matched
1287 + * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1288   */
1289  struct cfg80211_match_set {
1290         struct cfg80211_ssid ssid;
1291 +       s32 rssi_thold;
1292  };
1293  
1294  /**
1295 @@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
1296   * @dev: the interface
1297   * @scan_start: start time of the scheduled scan
1298   * @channels: channels to scan
1299 - * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1300 + * @min_rssi_thold: for drivers only supporting a single threshold, this
1301 + *     contains the minimum over all matchsets
1302   */
1303  struct cfg80211_sched_scan_request {
1304         struct cfg80211_ssid *ssids;
1305 @@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
1306         u32 flags;
1307         struct cfg80211_match_set *match_sets;
1308         int n_match_sets;
1309 -       s32 rssi_thold;
1310 +       s32 min_rssi_thold;
1311  
1312         /* internal */
1313         struct wiphy *wiphy;
1314 @@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
1315   * @identifier: (private) Identifier used in nl80211 to identify this
1316   *     wireless device if it has no netdev
1317   * @current_bss: (private) Used by the internal configuration code
1318 - * @channel: (private) Used by the internal configuration code to track
1319 - *     the user-set AP, monitor and WDS channel
1320 + * @chandef: (private) Used by the internal configuration code to track
1321 + *     the user-set channel definition.
1322   * @preset_chandef: (private) Used by the internal configuration code to
1323   *     track the channel to be used for AP later
1324   * @bssid: (private) Used by the internal configuration code
1325 @@ -3195,9 +3198,7 @@ struct wireless_dev {
1326  
1327         struct cfg80211_internal_bss *current_bss; /* associated / joined */
1328         struct cfg80211_chan_def preset_chandef;
1329 -
1330 -       /* for AP and mesh channel tracking */
1331 -       struct ieee80211_channel *channel;
1332 +       struct cfg80211_chan_def chandef;
1333  
1334         bool ibss_fixed;
1335         bool ibss_dfs_possible;
1336 @@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
1337   *
1338   * @dev: network device
1339   * @bssid: the BSSID of the IBSS joined
1340 + * @channel: the channel of the IBSS joined
1341   * @gfp: allocation flags
1342   *
1343   * This function notifies cfg80211 that the device joined an IBSS or
1344 @@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
1345   * with the locally generated beacon -- this guarantees that there is
1346   * always a scan result for this IBSS. cfg80211 will handle the rest.
1347   */
1348 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
1349 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1350 +                         struct ieee80211_channel *channel, gfp_t gfp);
1351  
1352  /**
1353   * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
1354 --- a/include/uapi/linux/nl80211.h
1355 +++ b/include/uapi/linux/nl80211.h
1356 @@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
1357   * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
1358   * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
1359   * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
1360 - * only report BSS with matching SSID.
1361 + *     only report BSS with matching SSID.
1362   * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
1363 - *     BSS in scan results. Filtering is turned off if not specified.
1364 + *     BSS in scan results. Filtering is turned off if not specified. Note that
1365 + *     if this attribute is in a match set of its own, then it is treated as
1366 + *     the default value for all matchsets with an SSID, rather than being a
1367 + *     matchset of its own without an RSSI filter. This is due to problems with
1368 + *     how this API was implemented in the past. Also, due to the same problem,
1369 + *     the only way to create a matchset with only an RSSI filter (with this
1370 + *     attribute) is if there's only a single matchset with the RSSI attribute.
1371   * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
1372   *     attribute number currently defined
1373   * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
1374 --- a/net/mac80211/agg-tx.c
1375 +++ b/net/mac80211/agg-tx.c
1376 @@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
1377         mgmt->u.action.u.addba_req.start_seq_num =
1378                                         cpu_to_le16(start_seq_num << 4);
1379  
1380 -       ieee80211_tx_skb_tid(sdata, skb, tid);
1381 +       ieee80211_tx_skb(sdata, skb);
1382  }
1383  
1384  void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
1385 --- a/net/mac80211/cfg.c
1386 +++ b/net/mac80211/cfg.c
1387 @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
1388         /* TODO: make hostapd tell us what it wants */
1389         sdata->smps_mode = IEEE80211_SMPS_OFF;
1390         sdata->needed_rx_chains = sdata->local->rx_chains;
1391 -       sdata->radar_required = params->radar_required;
1392  
1393         mutex_lock(&local->mtx);
1394 +       sdata->radar_required = params->radar_required;
1395         err = ieee80211_vif_use_channel(sdata, &params->chandef,
1396                                         IEEE80211_CHANCTX_SHARED);
1397         mutex_unlock(&local->mtx);
1398 @@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
1399                                         IEEE80211_P2P_OPPPS_ENABLE_BIT;
1400  
1401         err = ieee80211_assign_beacon(sdata, &params->beacon);
1402 -       if (err < 0)
1403 +       if (err < 0) {
1404 +               ieee80211_vif_release_channel(sdata);
1405                 return err;
1406 +       }
1407         changed |= err;
1408  
1409         err = drv_start_ap(sdata->local, sdata);
1410 @@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
1411                 if (old)
1412                         kfree_rcu(old, rcu_head);
1413                 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
1414 +               ieee80211_vif_release_channel(sdata);
1415                 return err;
1416         }
1417  
1418 @@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
1419         int err;
1420  
1421         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
1422 +       sdata_assert_lock(sdata);
1423  
1424         /* don't allow changing the beacon while CSA is in place - offset
1425          * of channel switch counter may change
1426 @@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
1427         struct probe_resp *old_probe_resp;
1428         struct cfg80211_chan_def chandef;
1429  
1430 +       sdata_assert_lock(sdata);
1431 +
1432         old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
1433         if (!old_beacon)
1434                 return -ENOENT;
1435 @@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
1436         kfree(sdata->u.ap.next_beacon);
1437         sdata->u.ap.next_beacon = NULL;
1438  
1439 -       cancel_work_sync(&sdata->u.ap.request_smps_work);
1440 -
1441         /* turn off carrier for this interface and dependent VLANs */
1442         list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1443                 netif_carrier_off(vlan->dev);
1444 @@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
1445         kfree_rcu(old_beacon, rcu_head);
1446         if (old_probe_resp)
1447                 kfree_rcu(old_probe_resp, rcu_head);
1448 +       sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
1449  
1450         __sta_info_flush(sdata, true);
1451         ieee80211_free_keys(sdata, true);
1452 @@ -2638,6 +2643,24 @@ static int ieee80211_start_roc_work(stru
1453         INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
1454         INIT_LIST_HEAD(&roc->dependents);
1455  
1456 +       /*
1457 +        * cookie is either the roc cookie (for normal roc)
1458 +        * or the SKB (for mgmt TX)
1459 +        */
1460 +       if (!txskb) {
1461 +               /* local->mtx protects this */
1462 +               local->roc_cookie_counter++;
1463 +               roc->cookie = local->roc_cookie_counter;
1464 +               /* wow, you wrapped 64 bits ... more likely a bug */
1465 +               if (WARN_ON(roc->cookie == 0)) {
1466 +                       roc->cookie = 1;
1467 +                       local->roc_cookie_counter++;
1468 +               }
1469 +               *cookie = roc->cookie;
1470 +       } else {
1471 +               *cookie = (unsigned long)txskb;
1472 +       }
1473 +
1474         /* if there's one pending or we're scanning, queue this one */
1475         if (!list_empty(&local->roc_list) ||
1476             local->scanning || local->radar_detect_enabled)
1477 @@ -2772,24 +2795,6 @@ static int ieee80211_start_roc_work(stru
1478         if (!queued)
1479                 list_add_tail(&roc->list, &local->roc_list);
1480  
1481 -       /*
1482 -        * cookie is either the roc cookie (for normal roc)
1483 -        * or the SKB (for mgmt TX)
1484 -        */
1485 -       if (!txskb) {
1486 -               /* local->mtx protects this */
1487 -               local->roc_cookie_counter++;
1488 -               roc->cookie = local->roc_cookie_counter;
1489 -               /* wow, you wrapped 64 bits ... more likely a bug */
1490 -               if (WARN_ON(roc->cookie == 0)) {
1491 -                       roc->cookie = 1;
1492 -                       local->roc_cookie_counter++;
1493 -               }
1494 -               *cookie = roc->cookie;
1495 -       } else {
1496 -               *cookie = (unsigned long)txskb;
1497 -       }
1498 -
1499         return 0;
1500  }
1501  
1502 @@ -3004,8 +3009,10 @@ void ieee80211_csa_finalize_work(struct 
1503         if (!ieee80211_sdata_running(sdata))
1504                 goto unlock;
1505  
1506 -       sdata->radar_required = sdata->csa_radar_required;
1507 +       sdata_assert_lock(sdata);
1508 +
1509         mutex_lock(&local->mtx);
1510 +       sdata->radar_required = sdata->csa_radar_required;
1511         err = ieee80211_vif_change_channel(sdata, &changed);
1512         mutex_unlock(&local->mtx);
1513         if (WARN_ON(err < 0))
1514 @@ -3022,13 +3029,13 @@ void ieee80211_csa_finalize_work(struct 
1515         switch (sdata->vif.type) {
1516         case NL80211_IFTYPE_AP:
1517                 err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
1518 +               kfree(sdata->u.ap.next_beacon);
1519 +               sdata->u.ap.next_beacon = NULL;
1520 +
1521                 if (err < 0)
1522                         goto unlock;
1523  
1524                 changed |= err;
1525 -               kfree(sdata->u.ap.next_beacon);
1526 -               sdata->u.ap.next_beacon = NULL;
1527 -
1528                 ieee80211_bss_info_change_notify(sdata, err);
1529                 break;
1530         case NL80211_IFTYPE_ADHOC:
1531 @@ -3066,7 +3073,7 @@ int ieee80211_channel_switch(struct wiph
1532         struct ieee80211_if_mesh __maybe_unused *ifmsh;
1533         int err, num_chanctx;
1534  
1535 -       lockdep_assert_held(&sdata->wdev.mtx);
1536 +       sdata_assert_lock(sdata);
1537  
1538         if (!list_empty(&local->roc_list) || local->scanning)
1539                 return -EBUSY;
1540 --- a/net/mac80211/ht.c
1541 +++ b/net/mac80211/ht.c
1542 @@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
1543         mgmt->u.action.u.delba.params = cpu_to_le16(params);
1544         mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
1545  
1546 -       ieee80211_tx_skb_tid(sdata, skb, tid);
1547 +       ieee80211_tx_skb(sdata, skb);
1548  }
1549  
1550  void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
1551 @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
1552                              u.ap.request_smps_work);
1553  
1554         sdata_lock(sdata);
1555 -       __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
1556 +       if (sdata_dereference(sdata->u.ap.beacon, sdata))
1557 +               __ieee80211_request_smps_ap(sdata,
1558 +                                           sdata->u.ap.driver_smps_mode);
1559         sdata_unlock(sdata);
1560  }
1561  
1562 --- a/net/mac80211/iface.c
1563 +++ b/net/mac80211/iface.c
1564 @@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
1565  
1566         ieee80211_roc_purge(local, sdata);
1567  
1568 -       if (sdata->vif.type == NL80211_IFTYPE_STATION)
1569 +       switch (sdata->vif.type) {
1570 +       case NL80211_IFTYPE_STATION:
1571                 ieee80211_mgd_stop(sdata);
1572 -
1573 -       if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
1574 +               break;
1575 +       case NL80211_IFTYPE_ADHOC:
1576                 ieee80211_ibss_stop(sdata);
1577 -
1578 +               break;
1579 +       case NL80211_IFTYPE_AP:
1580 +               cancel_work_sync(&sdata->u.ap.request_smps_work);
1581 +               break;
1582 +       default:
1583 +               break;
1584 +       }
1585  
1586         /*
1587          * Remove all stations associated with this interface.
1588 @@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
1589         cancel_work_sync(&local->dynamic_ps_enable_work);
1590  
1591         cancel_work_sync(&sdata->recalc_smps);
1592 +       sdata_lock(sdata);
1593         sdata->vif.csa_active = false;
1594 +       sdata_unlock(sdata);
1595         cancel_work_sync(&sdata->csa_finalize_work);
1596  
1597         cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
1598 --- a/net/mac80211/rx.c
1599 +++ b/net/mac80211/rx.c
1600 @@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
1601  {
1602         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1603  
1604 -       if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
1605 +       if (is_multicast_ether_addr(hdr->addr1))
1606                 return 0;
1607  
1608 -       return ieee80211_is_robust_mgmt_frame(hdr);
1609 +       return ieee80211_is_robust_mgmt_frame(skb);
1610  }
1611  
1612  
1613 @@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
1614  {
1615         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1616  
1617 -       if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
1618 +       if (!is_multicast_ether_addr(hdr->addr1))
1619                 return 0;
1620  
1621 -       return ieee80211_is_robust_mgmt_frame(hdr);
1622 +       return ieee80211_is_robust_mgmt_frame(skb);
1623  }
1624  
1625  
1626 @@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
1627         if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
1628                 return -1;
1629  
1630 -       if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
1631 +       if (!ieee80211_is_robust_mgmt_frame(skb))
1632                 return -1; /* not a robust management frame */
1633  
1634         mmie = (struct ieee80211_mmie *)
1635 @@ -1128,6 +1128,13 @@ static void sta_ps_end(struct sta_info *
1636                sta->sta.addr, sta->sta.aid);
1637  
1638         if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1639 +               /*
1640 +                * Clear the flag only if the other one is still set
1641 +                * so that the TX path won't start TX'ing new frames
1642 +                * directly ... In the case that the driver flag isn't
1643 +                * set ieee80211_sta_ps_deliver_wakeup() will clear it.
1644 +                */
1645 +               clear_sta_flag(sta, WLAN_STA_PS_STA);
1646                 ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
1647                        sta->sta.addr, sta->sta.aid);
1648                 return;
1649 @@ -1311,18 +1318,15 @@ ieee80211_rx_h_sta_process(struct ieee80
1650             !ieee80211_has_morefrags(hdr->frame_control) &&
1651             !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
1652             (rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1653 -            rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
1654 +            rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1655 +           /* PM bit is only checked in frames where it isn't reserved,
1656 +            * in AP mode it's reserved in non-bufferable management frames
1657 +            * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1658 +            */
1659 +           (!ieee80211_is_mgmt(hdr->frame_control) ||
1660 +            ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1661                 if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
1662 -                       /*
1663 -                        * Ignore doze->wake transitions that are
1664 -                        * indicated by non-data frames, the standard
1665 -                        * is unclear here, but for example going to
1666 -                        * PS mode and then scanning would cause a
1667 -                        * doze->wake transition for the probe request,
1668 -                        * and that is clearly undesirable.
1669 -                        */
1670 -                       if (ieee80211_is_data(hdr->frame_control) &&
1671 -                           !ieee80211_has_pm(hdr->frame_control))
1672 +                       if (!ieee80211_has_pm(hdr->frame_control))
1673                                 sta_ps_end(sta);
1674                 } else {
1675                         if (ieee80211_has_pm(hdr->frame_control))
1676 @@ -1845,8 +1849,7 @@ static int ieee80211_drop_unencrypted_mg
1677                  * having configured keys.
1678                  */
1679                 if (unlikely(ieee80211_is_action(fc) && !rx->key &&
1680 -                            ieee80211_is_robust_mgmt_frame(
1681 -                                    (struct ieee80211_hdr *) rx->skb->data)))
1682 +                            ieee80211_is_robust_mgmt_frame(rx->skb)))
1683                         return -EACCES;
1684         }
1685  
1686 --- a/net/mac80211/tx.c
1687 +++ b/net/mac80211/tx.c
1688 @@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc, 
1689         if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
1690                 return 0;
1691  
1692 -       if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
1693 -                                           skb->data))
1694 +       if (!ieee80211_is_robust_mgmt_frame(skb))
1695                 return 0;
1696  
1697         return 1;
1698 @@ -478,6 +477,20 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1699                        sta->sta.addr, sta->sta.aid, ac);
1700                 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
1701                         purge_old_ps_buffers(tx->local);
1702 +
1703 +               /* sync with ieee80211_sta_ps_deliver_wakeup */
1704 +               spin_lock(&sta->ps_lock);
1705 +               /*
1706 +                * STA woke up the meantime and all the frames on ps_tx_buf have
1707 +                * been queued to pending queue. No reordering can happen, go
1708 +                * ahead and Tx the packet.
1709 +                */
1710 +               if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
1711 +                   !test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1712 +                       spin_unlock(&sta->ps_lock);
1713 +                       return TX_CONTINUE;
1714 +               }
1715 +
1716                 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
1717                         struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
1718                         ps_dbg(tx->sdata,
1719 @@ -492,6 +505,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1720                 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
1721                 info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
1722                 skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb);
1723 +               spin_unlock(&sta->ps_lock);
1724  
1725                 if (!timer_pending(&local->sta_cleanup))
1726                         mod_timer(&local->sta_cleanup,
1727 @@ -525,9 +539,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
1728  
1729         /* only deauth, disassoc and action are bufferable MMPDUs */
1730         if (ieee80211_is_mgmt(hdr->frame_control) &&
1731 -           !ieee80211_is_deauth(hdr->frame_control) &&
1732 -           !ieee80211_is_disassoc(hdr->frame_control) &&
1733 -           !ieee80211_is_action(hdr->frame_control)) {
1734 +           !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
1735                 if (tx->flags & IEEE80211_TX_UNICAST)
1736                         info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1737                 return TX_CONTINUE;
1738 @@ -567,7 +579,7 @@ ieee80211_tx_h_select_key(struct ieee802
1739                 tx->key = key;
1740         else if (ieee80211_is_mgmt(hdr->frame_control) &&
1741                  is_multicast_ether_addr(hdr->addr1) &&
1742 -                ieee80211_is_robust_mgmt_frame(hdr) &&
1743 +                ieee80211_is_robust_mgmt_frame(tx->skb) &&
1744                  (key = rcu_dereference(tx->sdata->default_mgmt_key)))
1745                 tx->key = key;
1746         else if (is_multicast_ether_addr(hdr->addr1) &&
1747 @@ -582,12 +594,12 @@ ieee80211_tx_h_select_key(struct ieee802
1748                 tx->key = NULL;
1749         else if (tx->skb->protocol == tx->sdata->control_port_protocol)
1750                 tx->key = NULL;
1751 -       else if (ieee80211_is_robust_mgmt_frame(hdr) &&
1752 +       else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
1753                  !(ieee80211_is_action(hdr->frame_control) &&
1754                    tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
1755                 tx->key = NULL;
1756         else if (ieee80211_is_mgmt(hdr->frame_control) &&
1757 -                !ieee80211_is_robust_mgmt_frame(hdr))
1758 +                !ieee80211_is_robust_mgmt_frame(tx->skb))
1759                 tx->key = NULL;
1760         else {
1761                 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
1762 @@ -878,7 +890,7 @@ static int ieee80211_fragment(struct iee
1763         }
1764  
1765         /* adjust first fragment's length */
1766 -       skb->len = hdrlen + per_fragm;
1767 +       skb_trim(skb, hdrlen + per_fragm);
1768         return 0;
1769  }
1770  
1771 --- a/net/mac80211/wpa.c
1772 +++ b/net/mac80211/wpa.c
1773 @@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
1774         hdrlen = ieee80211_hdrlen(hdr->frame_control);
1775  
1776         if (!ieee80211_is_data(hdr->frame_control) &&
1777 -           !ieee80211_is_robust_mgmt_frame(hdr))
1778 +           !ieee80211_is_robust_mgmt_frame(skb))
1779                 return RX_CONTINUE;
1780  
1781         data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
1782 --- a/net/wireless/ap.c
1783 +++ b/net/wireless/ap.c
1784 @@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
1785         err = rdev_stop_ap(rdev, dev);
1786         if (!err) {
1787                 wdev->beacon_interval = 0;
1788 -               wdev->channel = NULL;
1789 +               memset(&wdev->chandef, 0, sizeof(wdev->chandef));
1790                 wdev->ssid_len = 0;
1791                 rdev_set_qos_map(rdev, dev, NULL);
1792 +               nl80211_send_ap_stopped(wdev);
1793         }
1794  
1795         return err;
1796 --- a/net/wireless/core.c
1797 +++ b/net/wireless/core.c
1798 @@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
1799  
1800         rdev->opencount--;
1801  
1802 -       WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1803 -               !rdev->scan_req->notified);
1804 +       if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1805 +               if (WARN_ON(!rdev->scan_req->notified))
1806 +                       rdev->scan_req->aborted = true;
1807 +               ___cfg80211_scan_done(rdev, false);
1808 +       }
1809  }
1810  
1811  static int cfg80211_rfkill_set_block(void *data, bool blocked)
1812 @@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
1813         int i;
1814         u16 ifmodes = wiphy->interface_modes;
1815  
1816 -       /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
1817 -       wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
1818 -
1819         /*
1820          * There are major locking problems in nl80211/mac80211 for CSA,
1821          * disable for all drivers until this has been reworked.
1822 @@ -875,8 +875,11 @@ static int cfg80211_netdev_notifier_call
1823                 break;
1824         case NETDEV_DOWN:
1825                 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
1826 -               WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1827 -                       !rdev->scan_req->notified);
1828 +               if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1829 +                       if (WARN_ON(!rdev->scan_req->notified))
1830 +                               rdev->scan_req->aborted = true;
1831 +                       ___cfg80211_scan_done(rdev, false);
1832 +               }
1833  
1834                 if (WARN_ON(rdev->sched_scan_req &&
1835                             rdev->sched_scan_req->dev == wdev->netdev)) {
1836 --- a/net/wireless/core.h
1837 +++ b/net/wireless/core.h
1838 @@ -62,6 +62,7 @@ struct cfg80211_registered_device {
1839         struct rb_root bss_tree;
1840         u32 bss_generation;
1841         struct cfg80211_scan_request *scan_req; /* protected by RTNL */
1842 +       struct sk_buff *scan_msg;
1843         struct cfg80211_sched_scan_request *sched_scan_req;
1844         unsigned long suspend_at;
1845         struct work_struct scan_done_wk;
1846 @@ -210,6 +211,7 @@ struct cfg80211_event {
1847                 } dc;
1848                 struct {
1849                         u8 bssid[ETH_ALEN];
1850 +                       struct ieee80211_channel *channel;
1851                 } ij;
1852         };
1853  };
1854 @@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
1855                           struct net_device *dev, bool nowext);
1856  int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
1857                         struct net_device *dev, bool nowext);
1858 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
1859 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1860 +                           struct ieee80211_channel *channel);
1861  int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
1862                             struct wireless_dev *wdev);
1863  
1864 @@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
1865                                    struct key_params *params, int key_idx,
1866                                    bool pairwise, const u8 *mac_addr);
1867  void __cfg80211_scan_done(struct work_struct *wk);
1868 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
1869 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
1870 +                          bool send_message);
1871  void __cfg80211_sched_scan_results(struct work_struct *wk);
1872  int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
1873                                bool driver_initiated);
1874 @@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
1875  void
1876  cfg80211_get_chan_state(struct wireless_dev *wdev,
1877                         struct ieee80211_channel **chan,
1878 -                       enum cfg80211_chan_mode *chanmode);
1879 +                       enum cfg80211_chan_mode *chanmode,
1880 +                       u8 *radar_detect);
1881  
1882  int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
1883                                  struct cfg80211_chan_def *chandef);
1884 --- a/net/wireless/nl80211.c
1885 +++ b/net/wireless/nl80211.c
1886 @@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
1887                                  * We can then retry with the larger buffer.
1888                                  */
1889                                 if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
1890 -                                   !skb->len &&
1891 +                                   !skb->len && !state->split &&
1892                                     cb->min_dump_alloc < 4096) {
1893                                         cb->min_dump_alloc = 4096;
1894 +                                       state->split_start = 0;
1895                                         rtnl_unlock();
1896                                         return 1;
1897                                 }
1898 @@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
1899                 nla_for_each_nested(nl_txq_params,
1900                                     info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
1901                                     rem_txq_params) {
1902 -                       nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1903 -                                 nla_data(nl_txq_params),
1904 -                                 nla_len(nl_txq_params),
1905 -                                 txq_params_policy);
1906 +                       result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1907 +                                          nla_data(nl_txq_params),
1908 +                                          nla_len(nl_txq_params),
1909 +                                          txq_params_policy);
1910 +                       if (result)
1911 +                               goto bad_res;
1912                         result = parse_txq_params(tb, &txq_params);
1913                         if (result)
1914                                 goto bad_res;
1915 @@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
1916         if (!err) {
1917                 wdev->preset_chandef = params.chandef;
1918                 wdev->beacon_interval = params.beacon_interval;
1919 -               wdev->channel = params.chandef.chan;
1920 +               wdev->chandef = params.chandef;
1921                 wdev->ssid_len = params.ssid_len;
1922                 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
1923         }
1924 @@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
1925  
1926         nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
1927                             rem_reg_rules) {
1928 -               nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1929 -                         nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1930 -                         reg_rule_policy);
1931 +               r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1932 +                             nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1933 +                             reg_rule_policy);
1934 +               if (r)
1935 +                       goto bad_reg;
1936                 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
1937                 if (r)
1938                         goto bad_reg;
1939 @@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
1940         if (!rdev->ops->scan)
1941                 return -EOPNOTSUPP;
1942  
1943 -       if (rdev->scan_req) {
1944 +       if (rdev->scan_req || rdev->scan_msg) {
1945                 err = -EBUSY;
1946                 goto unlock;
1947         }
1948 @@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
1949         enum ieee80211_band band;
1950         size_t ie_len;
1951         struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
1952 +       s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
1953  
1954         if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
1955             !rdev->ops->sched_scan_start)
1956 @@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
1957         if (n_ssids > wiphy->max_sched_scan_ssids)
1958                 return -EINVAL;
1959  
1960 -       if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
1961 +       /*
1962 +        * First, count the number of 'real' matchsets. Due to an issue with
1963 +        * the old implementation, matchsets containing only the RSSI attribute
1964 +        * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
1965 +        * RSSI for all matchsets, rather than their own matchset for reporting
1966 +        * all APs with a strong RSSI. This is needed to be compatible with
1967 +        * older userspace that treated a matchset with only the RSSI as the
1968 +        * global RSSI for all other matchsets - if there are other matchsets.
1969 +        */
1970 +       if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
1971                 nla_for_each_nested(attr,
1972                                     info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
1973 -                                   tmp)
1974 -                       n_match_sets++;
1975 +                                   tmp) {
1976 +                       struct nlattr *rssi;
1977 +
1978 +                       err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1979 +                                       nla_data(attr), nla_len(attr),
1980 +                                       nl80211_match_policy);
1981 +                       if (err)
1982 +                               return err;
1983 +                       /* add other standalone attributes here */
1984 +                       if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
1985 +                               n_match_sets++;
1986 +                               continue;
1987 +                       }
1988 +                       rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1989 +                       if (rssi)
1990 +                               default_match_rssi = nla_get_s32(rssi);
1991 +               }
1992 +       }
1993 +
1994 +       /* However, if there's no other matchset, add the RSSI one */
1995 +       if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
1996 +               n_match_sets = 1;
1997  
1998         if (n_match_sets > wiphy->max_match_sets)
1999                 return -EINVAL;
2000 @@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
2001                                     tmp) {
2002                         struct nlattr *ssid, *rssi;
2003  
2004 -                       nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2005 -                                 nla_data(attr), nla_len(attr),
2006 -                                 nl80211_match_policy);
2007 +                       err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2008 +                                       nla_data(attr), nla_len(attr),
2009 +                                       nl80211_match_policy);
2010 +                       if (err)
2011 +                               goto out_free;
2012                         ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
2013                         if (ssid) {
2014 +                               if (WARN_ON(i >= n_match_sets)) {
2015 +                                       /* this indicates a programming error,
2016 +                                        * the loop above should have verified
2017 +                                        * things properly
2018 +                                        */
2019 +                                       err = -EINVAL;
2020 +                                       goto out_free;
2021 +                               }
2022 +
2023                                 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
2024                                         err = -EINVAL;
2025                                         goto out_free;
2026 @@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
2027                                        nla_data(ssid), nla_len(ssid));
2028                                 request->match_sets[i].ssid.ssid_len =
2029                                         nla_len(ssid);
2030 +                               /* special attribute - old implemenation w/a */
2031 +                               request->match_sets[i].rssi_thold =
2032 +                                       default_match_rssi;
2033 +                               rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2034 +                               if (rssi)
2035 +                                       request->match_sets[i].rssi_thold =
2036 +                                               nla_get_s32(rssi);
2037                         }
2038 -                       rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2039 -                       if (rssi)
2040 -                               request->rssi_thold = nla_get_u32(rssi);
2041 -                       else
2042 -                               request->rssi_thold =
2043 -                                                  NL80211_SCAN_RSSI_THOLD_OFF;
2044                         i++;
2045                 }
2046 +
2047 +               /* there was no other matchset, so the RSSI one is alone */
2048 +               if (i == 0)
2049 +                       request->match_sets[0].rssi_thold = default_match_rssi;
2050 +
2051 +               request->min_rssi_thold = INT_MAX;
2052 +               for (i = 0; i < n_match_sets; i++)
2053 +                       request->min_rssi_thold =
2054 +                               min(request->match_sets[i].rssi_thold,
2055 +                                   request->min_rssi_thold);
2056 +       } else {
2057 +               request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
2058         }
2059  
2060         if (info->attrs[NL80211_ATTR_IE]) {
2061 @@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
2062  
2063         err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
2064         if (!err) {
2065 -               wdev->channel = chandef.chan;
2066 +               wdev->chandef = chandef;
2067                 wdev->cac_started = true;
2068                 wdev->cac_start_time = jiffies;
2069         }
2070 @@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
2071          * directly to the enum ieee80211_band values used in cfg80211.
2072          */
2073         BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
2074 -       nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
2075 -       {
2076 +       nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
2077                 enum ieee80211_band band = nla_type(tx_rates);
2078 +               int err;
2079 +
2080                 if (band < 0 || band >= IEEE80211_NUM_BANDS)
2081                         return -EINVAL;
2082                 sband = rdev->wiphy.bands[band];
2083                 if (sband == NULL)
2084                         return -EINVAL;
2085 -               nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2086 -                         nla_len(tx_rates), nl80211_txattr_policy);
2087 +               err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2088 +                               nla_len(tx_rates), nl80211_txattr_policy);
2089 +               if (err)
2090 +                       return err;
2091                 if (tb[NL80211_TXRATE_LEGACY]) {
2092                         mask.control[band].legacy = rateset_to_mask(
2093                                 sband,
2094 @@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
2095                                 NL80211_MCGRP_SCAN, GFP_KERNEL);
2096  }
2097  
2098 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2099 -                           struct wireless_dev *wdev)
2100 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2101 +                                      struct wireless_dev *wdev, bool aborted)
2102  {
2103         struct sk_buff *msg;
2104  
2105         msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2106         if (!msg)
2107 -               return;
2108 +               return NULL;
2109  
2110         if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2111 -                                 NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2112 +                                 aborted ? NL80211_CMD_SCAN_ABORTED :
2113 +                                           NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2114                 nlmsg_free(msg);
2115 -               return;
2116 +               return NULL;
2117         }
2118  
2119 -       genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2120 -                               NL80211_MCGRP_SCAN, GFP_KERNEL);
2121 +       return msg;
2122  }
2123  
2124 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2125 -                              struct wireless_dev *wdev)
2126 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2127 +                             struct sk_buff *msg)
2128  {
2129 -       struct sk_buff *msg;
2130 -
2131 -       msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2132         if (!msg)
2133                 return;
2134  
2135 -       if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2136 -                                 NL80211_CMD_SCAN_ABORTED) < 0) {
2137 -               nlmsg_free(msg);
2138 -               return;
2139 -       }
2140 -
2141         genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2142                                 NL80211_MCGRP_SCAN, GFP_KERNEL);
2143  }
2144 @@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
2145                     wdev->iftype != NL80211_IFTYPE_MESH_POINT))
2146                 return;
2147  
2148 -       wdev->channel = chandef->chan;
2149 +       wdev->chandef = *chandef;
2150 +       wdev->preset_chandef = *chandef;
2151         nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
2152  }
2153  EXPORT_SYMBOL(cfg80211_ch_switch_notify);
2154 @@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct 
2155  }
2156  EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
2157  
2158 +void nl80211_send_ap_stopped(struct wireless_dev *wdev)
2159 +{
2160 +       struct wiphy *wiphy = wdev->wiphy;
2161 +       struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
2162 +       struct sk_buff *msg;
2163 +       void *hdr;
2164 +
2165 +       msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2166 +       if (!msg)
2167 +               return;
2168 +
2169 +       hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
2170 +       if (!hdr)
2171 +               goto out;
2172 +
2173 +       if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
2174 +           nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
2175 +           nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
2176 +               goto out;
2177 +
2178 +       genlmsg_end(msg, hdr);
2179 +
2180 +       genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
2181 +                               NL80211_MCGRP_MLME, GFP_KERNEL);
2182 +       return;
2183 + out:
2184 +       nlmsg_free(msg);
2185 +}
2186 +
2187  /* initialisation/exit functions */
2188  
2189  int nl80211_init(void)
2190 --- a/net/wireless/nl80211.h
2191 +++ b/net/wireless/nl80211.h
2192 @@ -8,10 +8,10 @@ void nl80211_exit(void);
2193  void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
2194  void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
2195                              struct wireless_dev *wdev);
2196 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2197 -                           struct wireless_dev *wdev);
2198 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2199 -                              struct wireless_dev *wdev);
2200 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2201 +                                      struct wireless_dev *wdev, bool aborted);
2202 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2203 +                             struct sk_buff *msg);
2204  void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
2205                              struct net_device *netdev, u32 cmd);
2206  void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
2207 @@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
2208                      enum nl80211_radar_event event,
2209                      struct net_device *netdev, gfp_t gfp);
2210  
2211 +void nl80211_send_ap_stopped(struct wireless_dev *wdev);
2212 +
2213  void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
2214  
2215  #endif /* __NET_WIRELESS_NL80211_H */
2216 --- a/net/wireless/scan.c
2217 +++ b/net/wireless/scan.c
2218 @@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
2219                 dev->bss_generation++;
2220  }
2221  
2222 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
2223 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2224 +                          bool send_message)
2225  {
2226         struct cfg80211_scan_request *request;
2227         struct wireless_dev *wdev;
2228 +       struct sk_buff *msg;
2229  #ifdef CPTCFG_CFG80211_WEXT
2230         union iwreq_data wrqu;
2231  #endif
2232  
2233         ASSERT_RTNL();
2234  
2235 -       request = rdev->scan_req;
2236 +       if (rdev->scan_msg) {
2237 +               nl80211_send_scan_result(rdev, rdev->scan_msg);
2238 +               rdev->scan_msg = NULL;
2239 +               return;
2240 +       }
2241  
2242 +       request = rdev->scan_req;
2243         if (!request)
2244                 return;
2245  
2246 @@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
2247         if (wdev->netdev)
2248                 cfg80211_sme_scan_done(wdev->netdev);
2249  
2250 -       if (request->aborted) {
2251 -               nl80211_send_scan_aborted(rdev, wdev);
2252 -       } else {
2253 -               if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
2254 -                       /* flush entries from previous scans */
2255 -                       spin_lock_bh(&rdev->bss_lock);
2256 -                       __cfg80211_bss_expire(rdev, request->scan_start);
2257 -                       spin_unlock_bh(&rdev->bss_lock);
2258 -               }
2259 -               nl80211_send_scan_done(rdev, wdev);
2260 +       if (!request->aborted &&
2261 +           request->flags & NL80211_SCAN_FLAG_FLUSH) {
2262 +               /* flush entries from previous scans */
2263 +               spin_lock_bh(&rdev->bss_lock);
2264 +               __cfg80211_bss_expire(rdev, request->scan_start);
2265 +               spin_unlock_bh(&rdev->bss_lock);
2266         }
2267  
2268 +       msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
2269 +
2270  #ifdef CPTCFG_CFG80211_WEXT
2271         if (wdev->netdev && !request->aborted) {
2272                 memset(&wrqu, 0, sizeof(wrqu));
2273 @@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
2274  
2275         rdev->scan_req = NULL;
2276         kfree(request);
2277 +
2278 +       if (!send_message)
2279 +               rdev->scan_msg = msg;
2280 +       else
2281 +               nl80211_send_scan_result(rdev, msg);
2282  }
2283  
2284  void __cfg80211_scan_done(struct work_struct *wk)
2285 @@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
2286                             scan_done_wk);
2287  
2288         rtnl_lock();
2289 -       ___cfg80211_scan_done(rdev);
2290 +       ___cfg80211_scan_done(rdev, true);
2291         rtnl_unlock();
2292  }
2293  
2294 @@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
2295         if (IS_ERR(rdev))
2296                 return PTR_ERR(rdev);
2297  
2298 -       if (rdev->scan_req) {
2299 +       if (rdev->scan_req || rdev->scan_msg) {
2300                 err = -EBUSY;
2301                 goto out;
2302         }
2303 @@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
2304         if (IS_ERR(rdev))
2305                 return PTR_ERR(rdev);
2306  
2307 -       if (rdev->scan_req)
2308 +       if (rdev->scan_req || rdev->scan_msg)
2309                 return -EAGAIN;
2310  
2311         res = ieee80211_scan_results(rdev, info, extra, data->length);
2312 --- a/net/wireless/sme.c
2313 +++ b/net/wireless/sme.c
2314 @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
2315         ASSERT_RDEV_LOCK(rdev);
2316         ASSERT_WDEV_LOCK(wdev);
2317  
2318 -       if (rdev->scan_req)
2319 +       if (rdev->scan_req || rdev->scan_msg)
2320                 return -EBUSY;
2321  
2322         if (wdev->conn->params.channel)
2323 --- a/net/mac80211/mlme.c
2324 +++ b/net/mac80211/mlme.c
2325 @@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct 
2326         }
2327  
2328         ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
2329 -       sdata->vif.csa_active = true;
2330  
2331         mutex_lock(&local->chanctx_mtx);
2332         if (local->use_chanctx) {
2333 @@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct 
2334         mutex_unlock(&local->chanctx_mtx);
2335  
2336         sdata->csa_chandef = csa_ie.chandef;
2337 +       sdata->vif.csa_active = true;
2338  
2339         if (csa_ie.mode)
2340                 ieee80211_stop_queues_by_reason(&local->hw,
2341 --- a/net/mac80211/chan.c
2342 +++ b/net/mac80211/chan.c
2343 @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
2344  {
2345         struct ieee80211_sub_if_data *sdata;
2346  
2347 +       lockdep_assert_held(&local->mtx);
2348 +
2349         rcu_read_lock();
2350         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2351                 if (sdata->radar_required) {
2352 --- a/net/mac80211/ibss.c
2353 +++ b/net/mac80211/ibss.c
2354 @@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
2355         }
2356  
2357         mutex_lock(&local->mtx);
2358 -       ieee80211_vif_release_channel(sdata);
2359         if (ieee80211_vif_use_channel(sdata, &chandef,
2360                                       ifibss->fixed_channel ?
2361                                         IEEE80211_CHANCTX_SHARED :
2362 @@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
2363                 mutex_unlock(&local->mtx);
2364                 return;
2365         }
2366 +       sdata->radar_required = radar_required;
2367         mutex_unlock(&local->mtx);
2368  
2369         memcpy(ifibss->bssid, bssid, ETH_ALEN);
2370 @@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
2371         rcu_assign_pointer(ifibss->presp, presp);
2372         mgmt = (void *)presp->head;
2373  
2374 -       sdata->radar_required = radar_required;
2375         sdata->vif.bss_conf.enable_beacon = true;
2376         sdata->vif.bss_conf.beacon_int = beacon_int;
2377         sdata->vif.bss_conf.basic_rates = basic_rates;
2378 @@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
2379                                               presp->head_len, 0, GFP_KERNEL);
2380         cfg80211_put_bss(local->hw.wiphy, bss);
2381         netif_carrier_on(sdata->dev);
2382 -       cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
2383 +       cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
2384  }
2385  
2386  static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
2387 @@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
2388         int err;
2389         u32 sta_flags;
2390  
2391 +       sdata_assert_lock(sdata);
2392 +
2393         sta_flags = IEEE80211_STA_DISABLE_VHT;
2394         switch (ifibss->chandef.width) {
2395         case NL80211_CHAN_WIDTH_5:
2396 @@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
2397         memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
2398         ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
2399         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
2400 +
2401 +       /* avoid excessive retries for probe request to wildcard SSIDs */
2402 +       if (pos[1] == 0)
2403 +               IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
2404 +
2405         ieee80211_tx_skb(sdata, skb);
2406  }
2407  
2408 --- a/net/mac80211/mesh.c
2409 +++ b/net/mac80211/mesh.c
2410 @@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct 
2411         if (!ifmsh->mesh_id)
2412                 return false;
2413  
2414 +       sdata_assert_lock(sdata);
2415 +
2416         sta_flags = IEEE80211_STA_DISABLE_VHT;
2417         switch (sdata->vif.bss_conf.chandef.width) {
2418         case NL80211_CHAN_WIDTH_20_NOHT:
2419 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2420 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2421 @@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
2422         struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
2423         struct net_device *ndev = ifp->ndev;
2424         struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
2425 +       struct ieee80211_channel *chan;
2426         s32 err = 0;
2427  
2428         if (ifp->vif->mode == WL_MODE_AP) {
2429 @@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
2430         } else if (brcmf_is_linkup(e)) {
2431                 brcmf_dbg(CONN, "Linkup\n");
2432                 if (brcmf_is_ibssmode(ifp->vif)) {
2433 +                       chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
2434                         memcpy(profile->bssid, e->addr, ETH_ALEN);
2435                         wl_inform_ibss(cfg, ndev, e->addr);
2436 -                       cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
2437 +                       cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
2438                         clear_bit(BRCMF_VIF_STATUS_CONNECTING,
2439                                   &ifp->vif->sme_state);
2440                         set_bit(BRCMF_VIF_STATUS_CONNECTED,
2441 --- a/drivers/net/wireless/libertas/cfg.c
2442 +++ b/drivers/net/wireless/libertas/cfg.c
2443 @@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
2444         memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
2445         priv->wdev->ssid_len = params->ssid_len;
2446  
2447 -       cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
2448 +       cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
2449 +                            GFP_KERNEL);
2450  
2451         /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
2452         priv->connect_status = LBS_CONNECTED;
2453 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2454 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2455 @@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy 
2456                                      params->privacy);
2457  done:
2458         if (!ret) {
2459 -               cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
2460 +               cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
2461 +                                    params->chandef.chan, GFP_KERNEL);
2462                 dev_dbg(priv->adapter->dev,
2463                         "info: joined/created adhoc network with bssid"
2464                         " %pM successfully\n", priv->cfg_bssid);
2465 --- a/drivers/net/wireless/rndis_wlan.c
2466 +++ b/drivers/net/wireless/rndis_wlan.c
2467 @@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
2468                                         bssid, req_ie, req_ie_len,
2469                                         resp_ie, resp_ie_len, GFP_KERNEL);
2470         } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
2471 -               cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
2472 +               cfg80211_ibss_joined(usbdev->net, bssid,
2473 +                                    get_current_channel(usbdev, NULL),
2474 +                                    GFP_KERNEL);
2475  
2476         kfree(info);
2477  
2478 --- a/net/wireless/ibss.c
2479 +++ b/net/wireless/ibss.c
2480 @@ -14,7 +14,8 @@
2481  #include "rdev-ops.h"
2482  
2483  
2484 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
2485 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2486 +                           struct ieee80211_channel *channel)
2487  {
2488         struct wireless_dev *wdev = dev->ieee80211_ptr;
2489         struct cfg80211_bss *bss;
2490 @@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
2491         if (!wdev->ssid_len)
2492                 return;
2493  
2494 -       bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
2495 -                              wdev->ssid, wdev->ssid_len,
2496 +       bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
2497                                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
2498  
2499         if (WARN_ON(!bss))
2500 @@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
2501  #endif
2502  }
2503  
2504 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
2505 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2506 +                         struct ieee80211_channel *channel, gfp_t gfp)
2507  {
2508         struct wireless_dev *wdev = dev->ieee80211_ptr;
2509         struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
2510         struct cfg80211_event *ev;
2511         unsigned long flags;
2512  
2513 -       trace_cfg80211_ibss_joined(dev, bssid);
2514 +       trace_cfg80211_ibss_joined(dev, bssid, channel);
2515 +
2516 +       if (WARN_ON(!channel))
2517 +               return;
2518  
2519         ev = kzalloc(sizeof(*ev), gfp);
2520         if (!ev)
2521                 return;
2522  
2523         ev->type = EVENT_IBSS_JOINED;
2524 -       memcpy(ev->cr.bssid, bssid, ETH_ALEN);
2525 +       memcpy(ev->ij.bssid, bssid, ETH_ALEN);
2526 +       ev->ij.channel = channel;
2527  
2528         spin_lock_irqsave(&wdev->event_lock, flags);
2529         list_add_tail(&ev->list, &wdev->event_list);
2530 @@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
2531  
2532         wdev->ibss_fixed = params->channel_fixed;
2533         wdev->ibss_dfs_possible = params->userspace_handles_dfs;
2534 +       wdev->chandef = params->chandef;
2535  #ifdef CPTCFG_CFG80211_WEXT
2536         wdev->wext.ibss.chandef = params->chandef;
2537  #endif
2538 @@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
2539  
2540         wdev->current_bss = NULL;
2541         wdev->ssid_len = 0;
2542 +       memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2543  #ifdef CPTCFG_CFG80211_WEXT
2544         if (!nowext)
2545                 wdev->wext.ibss.ssid_len = 0;
2546 --- a/net/wireless/trace.h
2547 +++ b/net/wireless/trace.h
2548 @@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
2549         TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
2550  );
2551  
2552 -DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
2553 -       TP_PROTO(struct net_device *netdev, const u8 *addr),
2554 -       TP_ARGS(netdev, addr)
2555 -);
2556 -
2557  DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
2558         TP_PROTO(struct net_device *netdev, const u8 *addr),
2559         TP_ARGS(netdev, addr)
2560 @@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
2561         TP_ARGS(netdev, addr)
2562  );
2563  
2564 +TRACE_EVENT(cfg80211_ibss_joined,
2565 +       TP_PROTO(struct net_device *netdev, const u8 *bssid,
2566 +                struct ieee80211_channel *channel),
2567 +       TP_ARGS(netdev, bssid, channel),
2568 +       TP_STRUCT__entry(
2569 +               NETDEV_ENTRY
2570 +               MAC_ENTRY(bssid)
2571 +               CHAN_ENTRY
2572 +       ),
2573 +       TP_fast_assign(
2574 +               NETDEV_ASSIGN;
2575 +               MAC_ASSIGN(bssid, bssid);
2576 +               CHAN_ASSIGN(channel);
2577 +       ),
2578 +       TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
2579 +                 NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
2580 +);
2581 +
2582  TRACE_EVENT(cfg80211_probe_status,
2583         TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
2584                  bool acked),
2585 --- a/net/wireless/util.c
2586 +++ b/net/wireless/util.c
2587 @@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
2588                                                 ev->dc.reason, true);
2589                         break;
2590                 case EVENT_IBSS_JOINED:
2591 -                       __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
2592 +                       __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
2593 +                                              ev->ij.channel);
2594                         break;
2595                 }
2596                 wdev_unlock(wdev);
2597 @@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct 
2598                  */
2599                 mutex_lock_nested(&wdev_iter->mtx, 1);
2600                 __acquire(wdev_iter->mtx);
2601 -               cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
2602 +               cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
2603                 wdev_unlock(wdev_iter);
2604  
2605                 switch (chmode) {
2606 --- a/net/wireless/chan.c
2607 +++ b/net/wireless/chan.c
2608 @@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct 
2609  void
2610  cfg80211_get_chan_state(struct wireless_dev *wdev,
2611                         struct ieee80211_channel **chan,
2612 -                       enum cfg80211_chan_mode *chanmode)
2613 +                       enum cfg80211_chan_mode *chanmode,
2614 +                       u8 *radar_detect)
2615  {
2616         *chan = NULL;
2617         *chanmode = CHAN_MODE_UNDEFINED;
2618 @@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
2619                                      !wdev->ibss_dfs_possible)
2620                                   ? CHAN_MODE_SHARED
2621                                   : CHAN_MODE_EXCLUSIVE;
2622 +
2623 +                       /* consider worst-case - IBSS can try to return to the
2624 +                        * original user-specified channel as creator */
2625 +                       if (wdev->ibss_dfs_possible)
2626 +                               *radar_detect |= BIT(wdev->chandef.width);
2627                         return;
2628                 }
2629                 break;
2630 @@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
2631         case NL80211_IFTYPE_AP:
2632         case NL80211_IFTYPE_P2P_GO:
2633                 if (wdev->cac_started) {
2634 -                       *chan = wdev->channel;
2635 +                       *chan = wdev->chandef.chan;
2636                         *chanmode = CHAN_MODE_SHARED;
2637 +                       *radar_detect |= BIT(wdev->chandef.width);
2638                 } else if (wdev->beacon_interval) {
2639 -                       *chan = wdev->channel;
2640 +                       *chan = wdev->chandef.chan;
2641                         *chanmode = CHAN_MODE_SHARED;
2642 +
2643 +                       if (cfg80211_chandef_dfs_required(wdev->wiphy,
2644 +                                                         &wdev->chandef))
2645 +                               *radar_detect |= BIT(wdev->chandef.width);
2646                 }
2647                 return;
2648         case NL80211_IFTYPE_MESH_POINT:
2649                 if (wdev->mesh_id_len) {
2650 -                       *chan = wdev->channel;
2651 +                       *chan = wdev->chandef.chan;
2652                         *chanmode = CHAN_MODE_SHARED;
2653 +
2654 +                       if (cfg80211_chandef_dfs_required(wdev->wiphy,
2655 +                                                         &wdev->chandef))
2656 +                               *radar_detect |= BIT(wdev->chandef.width);
2657                 }
2658                 return;
2659         case NL80211_IFTYPE_MONITOR:
2660 --- a/net/wireless/mesh.c
2661 +++ b/net/wireless/mesh.c
2662 @@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
2663         if (!err) {
2664                 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
2665                 wdev->mesh_id_len = setup->mesh_id_len;
2666 -               wdev->channel = setup->chandef.chan;
2667 +               wdev->chandef = setup->chandef;
2668         }
2669  
2670         return err;
2671 @@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
2672                 err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
2673                                                      chandef->chan);
2674                 if (!err)
2675 -                       wdev->channel = chandef->chan;
2676 +                       wdev->chandef = *chandef;
2677  
2678                 return err;
2679         }
2680 @@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct 
2681         err = rdev_leave_mesh(rdev, dev);
2682         if (!err) {
2683                 wdev->mesh_id_len = 0;
2684 -               wdev->channel = NULL;
2685 +               memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2686                 rdev_set_qos_map(rdev, dev, NULL);
2687         }
2688  
2689 --- a/net/wireless/mlme.c
2690 +++ b/net/wireless/mlme.c
2691 @@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
2692         if (WARN_ON(!wdev->cac_started))
2693                 return;
2694  
2695 -       if (WARN_ON(!wdev->channel))
2696 +       if (WARN_ON(!wdev->chandef.chan))
2697                 return;
2698  
2699         switch (event) {
2700 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2701 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2702 @@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
2703                         break;
2704                 }
2705         }
2706 +
2707 +       if (is2GHz && !twiceMaxEdgePower)
2708 +               twiceMaxEdgePower = 60;
2709 +
2710         return twiceMaxEdgePower;
2711  }
2712  
2713 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2714 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2715 @@ -23,10 +23,11 @@
2716  #define MAX_MEASUREMENT        MAX_IQCAL_MEASUREMENT
2717  #define MAX_MAG_DELTA  11
2718  #define MAX_PHS_DELTA  10
2719 +#define MAXIQCAL        3
2720  
2721  struct coeff {
2722 -       int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2723 -       int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2724 +       int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2725 +       int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2726         int iqc_coeff[2];
2727  };
2728  
2729 @@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2730         if (q_q_coff > 63)
2731                 q_q_coff = 63;
2732  
2733 -       iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
2734 +       iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
2735  
2736         ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
2737                 chain_idx, iqc_coeff[0]);
2738 @@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2739         if (q_q_coff > 63)
2740                 q_q_coff = 63;
2741  
2742 -       iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
2743 +       iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
2744  
2745         ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
2746                 chain_idx, iqc_coeff[1]);
2747 @@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
2748         return true;
2749  }
2750  
2751 -static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
2752 +static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
2753 +                                    int nmeasurement,
2754                                      int max_delta)
2755  {
2756         int mp_max = -64, max_idx = 0;
2757 @@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
2758  
2759         /* find min/max mismatch across all calibrated gains */
2760         for (i = 0; i < nmeasurement; i++) {
2761 -               if (mp_coeff[i] > mp_max) {
2762 -                       mp_max = mp_coeff[i];
2763 +               if (mp_coeff[i][0] > mp_max) {
2764 +                       mp_max = mp_coeff[i][0];
2765                         max_idx = i;
2766 -               } else if (mp_coeff[i] < mp_min) {
2767 -                       mp_min = mp_coeff[i];
2768 +               } else if (mp_coeff[i][0] < mp_min) {
2769 +                       mp_min = mp_coeff[i][0];
2770                         min_idx = i;
2771                 }
2772         }
2773  
2774         /* find average (exclude max abs value) */
2775         for (i = 0; i < nmeasurement; i++) {
2776 -               if ((abs(mp_coeff[i]) < abs(mp_max)) ||
2777 -                   (abs(mp_coeff[i]) < abs(mp_min))) {
2778 -                       mp_avg += mp_coeff[i];
2779 +               if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
2780 +                   (abs(mp_coeff[i][0]) < abs(mp_min))) {
2781 +                       mp_avg += mp_coeff[i][0];
2782                         mp_count++;
2783                 }
2784         }
2785 @@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
2786         if (mp_count)
2787                 mp_avg /= mp_count;
2788         else
2789 -               mp_avg = mp_coeff[nmeasurement - 1];
2790 +               mp_avg = mp_coeff[nmeasurement - 1][0];
2791  
2792         /* detect outlier */
2793         if (abs(mp_max - mp_min) > max_delta) {
2794 @@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
2795                 else
2796                         outlier_idx = min_idx;
2797  
2798 -               mp_coeff[outlier_idx] = mp_avg;
2799 +               mp_coeff[outlier_idx][0] = mp_avg;
2800         }
2801  }
2802  
2803 -static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
2804 -                                                struct coeff *coeff,
2805 -                                                bool is_reusable)
2806 +static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
2807 +                                                 struct coeff *coeff,
2808 +                                                 bool is_reusable)
2809  {
2810         int i, im, nmeasurement;
2811 +       int magnitude, phase;
2812         u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
2813         struct ath9k_hw_cal_data *caldata = ah->caldata;
2814  
2815 @@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
2816                 if (nmeasurement > MAX_MEASUREMENT)
2817                         nmeasurement = MAX_MEASUREMENT;
2818  
2819 -               /* detect outlier only if nmeasurement > 1 */
2820 -               if (nmeasurement > 1) {
2821 -                       /* Detect magnitude outlier */
2822 -                       ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2823 -                                       nmeasurement, MAX_MAG_DELTA);
2824 -
2825 -                       /* Detect phase outlier */
2826 -                       ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2827 -                                       nmeasurement, MAX_PHS_DELTA);
2828 +               /*
2829 +                * Skip normal outlier detection for AR9550.
2830 +                */
2831 +               if (!AR_SREV_9550(ah)) {
2832 +                       /* detect outlier only if nmeasurement > 1 */
2833 +                       if (nmeasurement > 1) {
2834 +                               /* Detect magnitude outlier */
2835 +                               ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2836 +                                                        nmeasurement,
2837 +                                                        MAX_MAG_DELTA);
2838 +
2839 +                               /* Detect phase outlier */
2840 +                               ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2841 +                                                        nmeasurement,
2842 +                                                        MAX_PHS_DELTA);
2843 +                       }
2844                 }
2845  
2846                 for (im = 0; im < nmeasurement; im++) {
2847 +                       magnitude = coeff->mag_coeff[i][im][0];
2848 +                       phase = coeff->phs_coeff[i][im][0];
2849  
2850 -                       coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
2851 -                               ((coeff->phs_coeff[i][im] & 0x7f) << 7);
2852 +                       coeff->iqc_coeff[0] =
2853 +                               (phase & 0x7f) | ((magnitude & 0x7f) << 7);
2854  
2855                         if ((im % 2) == 0)
2856                                 REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
2857 @@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
2858         return true;
2859  }
2860  
2861 -static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
2862 +static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
2863 +                                   struct coeff *coeff,
2864 +                                   int i, int nmeasurement)
2865 +{
2866 +       struct ath_common *common = ath9k_hw_common(ah);
2867 +       int im, ix, iy, temp;
2868 +
2869 +       for (im = 0; im < nmeasurement; im++) {
2870 +               for (ix = 0; ix < MAXIQCAL - 1; ix++) {
2871 +                       for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
2872 +                               if (coeff->mag_coeff[i][im][iy] <
2873 +                                   coeff->mag_coeff[i][im][ix]) {
2874 +                                       temp = coeff->mag_coeff[i][im][ix];
2875 +                                       coeff->mag_coeff[i][im][ix] =
2876 +                                               coeff->mag_coeff[i][im][iy];
2877 +                                       coeff->mag_coeff[i][im][iy] = temp;
2878 +                               }
2879 +                               if (coeff->phs_coeff[i][im][iy] <
2880 +                                   coeff->phs_coeff[i][im][ix]) {
2881 +                                       temp = coeff->phs_coeff[i][im][ix];
2882 +                                       coeff->phs_coeff[i][im][ix] =
2883 +                                               coeff->phs_coeff[i][im][iy];
2884 +                                       coeff->phs_coeff[i][im][iy] = temp;
2885 +                               }
2886 +                       }
2887 +               }
2888 +               coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
2889 +               coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
2890 +
2891 +               ath_dbg(common, CALIBRATE,
2892 +                       "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
2893 +                       i, im,
2894 +                       coeff->mag_coeff[i][im][0],
2895 +                       coeff->phs_coeff[i][im][0]);
2896 +       }
2897 +}
2898 +
2899 +static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
2900 +                                   struct coeff *coeff,
2901 +                                   int iqcal_idx,
2902 +                                   int nmeasurement)
2903 +{
2904 +       int i;
2905 +
2906 +       if ((iqcal_idx + 1) != MAXIQCAL)
2907 +               return false;
2908 +
2909 +       for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2910 +               __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
2911 +       }
2912 +
2913 +       return true;
2914 +}
2915 +
2916 +static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
2917 +                                         int iqcal_idx,
2918 +                                         bool is_reusable)
2919  {
2920         struct ath_common *common = ath9k_hw_common(ah);
2921         const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
2922 @@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
2923                 AR_PHY_CHAN_INFO_TAB_1,
2924                 AR_PHY_CHAN_INFO_TAB_2,
2925         };
2926 -       struct coeff coeff;
2927 +       static struct coeff coeff;
2928         s32 iq_res[6];
2929         int i, im, j;
2930 -       int nmeasurement;
2931 +       int nmeasurement = 0;
2932 +       bool outlier_detect = true;
2933  
2934         for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2935                 if (!(ah->txchainmask & (1 << i)))
2936 @@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
2937                                 goto tx_iqcal_fail;
2938                         }
2939  
2940 -                       coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
2941 -                       coeff.phs_coeff[i][im] =
2942 +                       coeff.phs_coeff[i][im][iqcal_idx] =
2943 +                               coeff.iqc_coeff[0] & 0x7f;
2944 +                       coeff.mag_coeff[i][im][iqcal_idx] =
2945                                 (coeff.iqc_coeff[0] >> 7) & 0x7f;
2946  
2947 -                       if (coeff.mag_coeff[i][im] > 63)
2948 -                               coeff.mag_coeff[i][im] -= 128;
2949 -                       if (coeff.phs_coeff[i][im] > 63)
2950 -                               coeff.phs_coeff[i][im] -= 128;
2951 +                       if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
2952 +                               coeff.mag_coeff[i][im][iqcal_idx] -= 128;
2953 +                       if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
2954 +                               coeff.phs_coeff[i][im][iqcal_idx] -= 128;
2955                 }
2956         }
2957 -       ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
2958 +
2959 +       if (AR_SREV_9550(ah))
2960 +               outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
2961 +                                                        iqcal_idx, nmeasurement);
2962 +       if (outlier_detect)
2963 +               ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
2964  
2965         return;
2966  
2967 @@ -1409,7 +1484,7 @@ skip_tx_iqcal:
2968         }
2969  
2970         if (txiqcal_done)
2971 -               ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
2972 +               ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
2973         else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
2974                 ar9003_hw_tx_iq_cal_reload(ah);
2975  
2976 @@ -1455,14 +1530,38 @@ skip_tx_iqcal:
2977         return true;
2978  }
2979  
2980 +static bool do_ar9003_agc_cal(struct ath_hw *ah)
2981 +{
2982 +       struct ath_common *common = ath9k_hw_common(ah);
2983 +       bool status;
2984 +
2985 +       REG_WRITE(ah, AR_PHY_AGC_CONTROL,
2986 +                 REG_READ(ah, AR_PHY_AGC_CONTROL) |
2987 +                 AR_PHY_AGC_CONTROL_CAL);
2988 +
2989 +       status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
2990 +                              AR_PHY_AGC_CONTROL_CAL,
2991 +                              0, AH_WAIT_TIMEOUT);
2992 +       if (!status) {
2993 +               ath_dbg(common, CALIBRATE,
2994 +                       "offset calibration failed to complete in %d ms,"
2995 +                       "noisy environment?\n",
2996 +                       AH_WAIT_TIMEOUT / 1000);
2997 +               return false;
2998 +       }
2999 +
3000 +       return true;
3001 +}
3002 +
3003  static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
3004                                    struct ath9k_channel *chan)
3005  {
3006         struct ath_common *common = ath9k_hw_common(ah);
3007         struct ath9k_hw_cal_data *caldata = ah->caldata;
3008         bool txiqcal_done = false;
3009 -       bool is_reusable = true, status = true;
3010 +       bool status = true;
3011         bool run_agc_cal = false, sep_iq_cal = false;
3012 +       int i = 0;
3013  
3014         /* Use chip chainmask only for calibration */
3015         ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
3016 @@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
3017          * AGC calibration. Specifically, AR9550 in SoC chips.
3018          */
3019         if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
3020 -               txiqcal_done = true;
3021 +               if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
3022 +                                  AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
3023 +                               txiqcal_done = true;
3024 +               } else {
3025 +                       txiqcal_done = false;
3026 +               }
3027                 run_agc_cal = true;
3028         } else {
3029                 sep_iq_cal = true;
3030 @@ -1512,27 +1616,37 @@ skip_tx_iqcal:
3031                 if (AR_SREV_9330_11(ah))
3032                         ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
3033  
3034 -               /* Calibrate the AGC */
3035 -               REG_WRITE(ah, AR_PHY_AGC_CONTROL,
3036 -                         REG_READ(ah, AR_PHY_AGC_CONTROL) |
3037 -                         AR_PHY_AGC_CONTROL_CAL);
3038 -
3039 -               /* Poll for offset calibration complete */
3040 -               status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
3041 -                                      AR_PHY_AGC_CONTROL_CAL,
3042 -                                      0, AH_WAIT_TIMEOUT);
3043 -       }
3044 +               /*
3045 +                * For non-AR9550 chips, we just trigger AGC calibration
3046 +                * in the HW, poll for completion and then process
3047 +                * the results.
3048 +                *
3049 +                * For AR955x, we run it multiple times and use
3050 +                * median IQ correction.
3051 +                */
3052 +               if (!AR_SREV_9550(ah)) {
3053 +                       status = do_ar9003_agc_cal(ah);
3054 +                       if (!status)
3055 +                               return false;
3056  
3057 -       if (!status) {
3058 -               ath_dbg(common, CALIBRATE,
3059 -                       "offset calibration failed to complete in %d ms; noisy environment?\n",
3060 -                       AH_WAIT_TIMEOUT / 1000);
3061 -               return false;
3062 +                       if (txiqcal_done)
3063 +                               ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
3064 +               } else {
3065 +                       if (!txiqcal_done) {
3066 +                               status = do_ar9003_agc_cal(ah);
3067 +                               if (!status)
3068 +                                       return false;
3069 +                       } else {