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