1 commit b14fbb554fc65a2e0b5c41a319269b0350f187e7
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Sat Feb 22 14:35:25 2014 +0100
5 ath9k: do not set half/quarter channel flags in AR_PHY_MODE
7 5/10 MHz channel bandwidth is configured via the PLL clock, instead of
8 the AR_PHY_MODE register. Using that register is AR93xx specific, and
9 makes the mode incompatible with earlier chipsets.
11 In some early versions, these flags were apparently applied at the wrong
12 point in time and thus did not cause connectivity issues, however now
13 they are causing problems, as pointed out in this OpenWrt ticket:
15 https://dev.openwrt.org/ticket/14916
17 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
19 commit 0f1cb7be2551b30b02cd54c897e0e29e483cfda5
20 Author: Felix Fietkau <nbd@openwrt.org>
21 Date: Sat Feb 22 13:43:29 2014 +0100
23 ath9k: fix ps-poll responses under a-mpdu sessions
25 When passing tx frames to the U-APSD queue for powersave poll responses,
26 the ath_atx_tid pointer needs to be passed to ath_tx_setup_buffer for
27 proper sequence number accounting.
29 This fixes high latency and connection stability issues with ath9k
30 running as AP and a few kinds of mobile phones as client, when PS-Poll
33 Cc: stable@vger.kernel.org
34 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
36 commit d5d87a37bbd6066b2c3c5d0bd0fe2a6e2ea45cc5
37 Author: Felix Fietkau <nbd@openwrt.org>
38 Date: Fri Feb 21 11:39:59 2014 +0100
40 ath9k: list more reset causes in debugfs
42 Number of MAC hangs and stuck beacons were missing
44 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
46 commit d84856012e0f10fe598a5ad3b7b869397a089e07
47 Author: Johannes Berg <johannes.berg@intel.com>
48 Date: Thu Feb 20 11:19:58 2014 +0100
50 mac80211: fix station wakeup powersave race
52 Consider the following (relatively unlikely) scenario:
53 1) station goes to sleep while frames are buffered in driver
54 2) driver blocks wakeup (until no more frames are buffered)
55 3) station wakes up again
56 4) driver unblocks wakeup
58 In this case, the current mac80211 code will do the following:
59 1) WLAN_STA_PS_STA set
60 2) WLAN_STA_PS_DRIVER set
62 4) WLAN_STA_PS_DRIVER cleared
64 As a result, no frames will be delivered to the client, even
65 though it is awake, until it sends another frame to us that
66 triggers ieee80211_sta_ps_deliver_wakeup() in sta_ps_end().
68 Since we now take the PS spinlock, we can fix this while at
69 the same time removing the complexity with the pending skb
70 queue function. This was broken since my commit 50a9432daeec
71 ("mac80211: fix powersaving clients races") due to removing
72 the clearing of WLAN_STA_PS_STA in the RX path.
74 While at it, fix a cleanup path issue when a station is
75 removed while the driver is still blocking its wakeup.
77 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
79 commit 798f2786602cbe93e6b928299614aa36ebf50692
80 Author: Johannes Berg <johannes.berg@intel.com>
81 Date: Mon Feb 17 20:49:03 2014 +0100
83 mac80211: insert stations before adding to driver
85 There's a race condition in mac80211 because we add stations
86 to the internal lists after adding them to the driver, which
87 means that (for example) the following can happen:
88 1. a station connects and is added
89 2. first, it is added to the driver
90 3. then, it is added to the mac80211 lists
92 If the station goes to sleep between steps 2 and 3, and the
93 firmware/hardware records it as being asleep, mac80211 will
94 never instruct the driver to wake it up again as it never
95 realized it went to sleep since the RX path discarded the
96 frame as a "spurious class 3 frame", no station entry was
99 Fix this by adding the station in software first, and only
100 then adding it to the driver. That way, any state that the
101 driver changes will be reflected properly in mac80211's
102 station state. The problematic part is the roll-back if the
103 driver fails to add the station, in that case a bit more is
104 needed. To not make that overly complex prevent starting BA
105 sessions in the meantime.
107 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
109 commit b9ba6a520cb07ab3aa7aaaf9ce4a0bc7a6bc06fe
110 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
111 Date: Thu Feb 20 09:22:11 2014 +0200
113 mac80211: fix AP powersave TX vs. wakeup race
115 There is a race between the TX path and the STA wakeup: while
116 a station is sleeping, mac80211 buffers frames until it wakes
117 up, then the frames are transmitted. However, the RX and TX
118 path are concurrent, so the packet indicating wakeup can be
119 processed while a packet is being transmitted.
121 This can lead to a situation where the buffered frames list
122 is emptied on the one side, while a frame is being added on
123 the other side, as the station is still seen as sleeping in
126 As a result, the newly added frame will not be send anytime
127 soon. It might be sent much later (and out of order) when the
128 station goes to sleep and wakes up the next time.
130 Additionally, it can lead to the crash below.
132 Fix all this by synchronising both paths with a new lock.
133 Both path are not fastpath since they handle PS situations.
135 In a later patch we'll remove the extra skb queue locks to
136 reduce locking overhead.
138 BUG: unable to handle kernel
139 NULL pointer dereference at 000000b0
140 IP: [<ff6f1791>] ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
142 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
143 EIP: 0060:[<ff6f1791>] EFLAGS: 00210282 CPU: 1
144 EIP is at ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
145 EAX: e5900da0 EBX: 00000000 ECX: 00000001 EDX: 00000000
146 ESI: e41d00c0 EDI: e5900da0 EBP: ebe458e4 ESP: ebe458b0
147 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
148 CR0: 8005003b CR2: 000000b0 CR3: 25a78000 CR4: 000407d0
149 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
150 DR6: ffff0ff0 DR7: 00000400
151 Process iperf (pid: 3934, ti=ebe44000 task=e757c0b0 task.ti=ebe44000)
152 iwlwifi 0000:02:00.0: I iwl_pcie_enqueue_hcmd Sending command LQ_CMD (#4e), seq: 0x0903, 92 bytes at 3[3]:9
154 e403b32c ebe458c4 00200002 00200286 e403b338 ebe458cc c10960bb e5900da0
155 ff76a6ec ebe458d8 00000000 e41d00c0 e5900da0 ebe458f0 ff6f1b75 e403b210
156 ebe4598c ff723dc1 00000000 ff76a6ec e597c978 e403b758 00000002 00000002
158 [<ff6f1b75>] ieee80211_free_txskb+0x15/0x20 [mac80211]
159 [<ff723dc1>] invoke_tx_handlers+0x1661/0x1780 [mac80211]
160 [<ff7248a5>] ieee80211_tx+0x75/0x100 [mac80211]
161 [<ff7249bf>] ieee80211_xmit+0x8f/0xc0 [mac80211]
162 [<ff72550e>] ieee80211_subif_start_xmit+0x4fe/0xe20 [mac80211]
163 [<c149ef70>] dev_hard_start_xmit+0x450/0x950
164 [<c14b9aa9>] sch_direct_xmit+0xa9/0x250
165 [<c14b9c9b>] __qdisc_run+0x4b/0x150
166 [<c149f732>] dev_queue_xmit+0x2c2/0xca0
168 Cc: stable@vger.kernel.org
169 Reported-by: Yaara Rozenblum <yaara.rozenblum@intel.com>
170 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
171 Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
172 [reword commit log, use a separate lock]
173 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
175 commit 80e419de0dff38436b30d363311c625766193f86
176 Author: Inbal Hacohen <Inbal.Hacohen@intel.com>
177 Date: Wed Feb 12 09:32:27 2014 +0200
179 cfg80211: bugfix in regulatory user hint process
181 After processing hint_user, we would want to schedule the
182 timeout work only if we are actually waiting to CRDA. This happens
183 when the status is not "IGNORE" nor "ALREADY_SET".
185 Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
186 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
188 commit 6514c93afede55284e2cb63359aadedb85884c80
189 Author: Jouni Malinen <jouni@qca.qualcomm.com>
190 Date: Tue Feb 18 20:41:08 2014 +0200
192 ath9k: Enable U-APSD AP mode support
194 mac80211 handles the actual operations, so ath9k can just indicate
195 support for this. Based on initial tests, this combination seems to
198 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
200 commit a63caf0a357ad5c1f08d6b7827dc76c451445017
201 Author: Stanislaw Gruszka <sgruszka@redhat.com>
202 Date: Wed Feb 19 13:15:17 2014 +0100
204 ath9k: protect tid->sched check
206 We check tid->sched without a lock taken on ath_tx_aggr_sleep(). That
207 is race condition which can result of doing list_del(&tid->list) twice
208 (second time with poisoned list node) and cause crash like shown below:
210 [424271.637220] BUG: unable to handle kernel paging request at 00100104
211 [424271.637328] IP: [<f90fc072>] ath_tx_aggr_sleep+0x62/0xe0 [ath9k]
213 [424271.639953] Call Trace:
214 [424271.639998] [<f90f6900>] ? ath9k_get_survey+0x110/0x110 [ath9k]
215 [424271.640083] [<f90f6942>] ath9k_sta_notify+0x42/0x50 [ath9k]
216 [424271.640177] [<f809cfef>] sta_ps_start+0x8f/0x1c0 [mac80211]
217 [424271.640258] [<c10f730e>] ? free_compound_page+0x2e/0x40
218 [424271.640346] [<f809e915>] ieee80211_rx_handlers+0x9d5/0x2340 [mac80211]
219 [424271.640437] [<c112f048>] ? kmem_cache_free+0x1d8/0x1f0
220 [424271.640510] [<c1345a84>] ? kfree_skbmem+0x34/0x90
221 [424271.640578] [<c10fc23c>] ? put_page+0x2c/0x40
222 [424271.640640] [<c1345a84>] ? kfree_skbmem+0x34/0x90
223 [424271.640706] [<c1345a84>] ? kfree_skbmem+0x34/0x90
224 [424271.640787] [<f809dde3>] ? ieee80211_rx_handlers_result+0x73/0x1d0 [mac80211]
225 [424271.640897] [<f80a07a0>] ieee80211_prepare_and_rx_handle+0x520/0xad0 [mac80211]
226 [424271.641009] [<f809e22d>] ? ieee80211_rx_handlers+0x2ed/0x2340 [mac80211]
227 [424271.641104] [<c13846ce>] ? ip_output+0x7e/0xd0
228 [424271.641182] [<f80a1057>] ieee80211_rx+0x307/0x7c0 [mac80211]
229 [424271.641266] [<f90fa6ee>] ath_rx_tasklet+0x88e/0xf70 [ath9k]
230 [424271.641358] [<f80a0f2c>] ? ieee80211_rx+0x1dc/0x7c0 [mac80211]
231 [424271.641445] [<f90f82db>] ath9k_tasklet+0xcb/0x130 [ath9k]
234 https://bugzilla.kernel.org/show_bug.cgi?id=70551
236 Reported-and-tested-by: Max Sydorenko <maxim.stargazer@gmail.com>
237 Cc: stable@vger.kernel.org
238 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
240 commit 82ed9e3ccc02797df2ffe4b78127c4cd5f799a41
241 Author: Felix Fietkau <nbd@openwrt.org>
242 Date: Tue Feb 11 15:54:13 2014 +0100
244 mac80211: send control port protocol frames to the VO queue
246 Improves reliability of wifi connections with WPA, since authentication
247 frames are prioritized over normal traffic and also typically exempt
250 Cc: stable@vger.kernel.org
251 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
253 commit d4426800f71e972feaa33e04c5801fc730627bdd
254 Author: Stanislaw Gruszka <stf_xl@wp.pl>
255 Date: Mon Feb 10 22:38:28 2014 +0100
257 rtl8187: fix regression on MIPS without coherent DMA
259 This patch fixes regression caused by commit a16dad77634 "MIPS: Fix
260 potencial corruption". That commit fixes one corruption scenario in
261 cost of adding another one, which actually start to cause crashes
262 on Yeeloong laptop when rtl8187 driver is used.
264 For correct DMA read operation on machines without DMA coherence, kernel
265 have to invalidate cache, such it will refill later with new data that
266 device wrote to memory, when that data is needed to process. We can only
267 invalidate full cache line. Hence when cache line includes both dma
268 buffer and some other data (written in cache, but not yet in main
269 memory), the other data can not hit memory due to invalidation. That
270 happen on rtl8187 where struct rtl8187_priv fields are located just
271 before and after small buffers that are passed to USB layer and DMA
272 is performed on them.
274 To fix the problem we align buffers and reserve space after them to make
275 them match cache line.
277 This patch does not resolve all possible MIPS problems entirely, for
278 that we have to assure that we always map cache aligned buffers for DMA,
279 what can be complex or even not possible. But patch fixes visible and
280 reproducible regression and seems other possible corruptions do not
281 happen in practice, since Yeeloong laptop works stable without rtl8187
285 https://bugzilla.kernel.org/show_bug.cgi?id=54391
287 Reported-by: Petr Pisar <petr.pisar@atlas.cz>
288 Bisected-by: Tom Li <biergaizi2009@gmail.com>
289 Reported-and-tested-by: Tom Li <biergaizi2009@gmail.com>
290 Cc: stable@vger.kernel.org
291 Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
293 commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
294 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
295 Date: Fri Feb 7 10:29:55 2014 +0530
297 ath9k: Calculate IQ-CAL median
299 This patch adds a routine to calculate the median IQ correction
300 values for AR955x, which is used for outlier detection.
301 The normal method which is used for all other chips is
304 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
306 commit c52a6fce0820c8d0687443ab86058ae03b478c8f
307 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
308 Date: Fri Feb 7 10:29:54 2014 +0530
310 ath9k: Expand the IQ coefficient array
312 This will be used for storing data for mutiple
313 IQ calibration runs, for AR955x.
315 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
317 commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
318 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
319 Date: Fri Feb 7 10:29:53 2014 +0530
321 ath9k: Modify IQ calibration for AR955x
323 IQ calibration post-processing for AR955x is different
324 from other chips - instead of just doing it as part
325 of AGC calibration once, it is triggered 3 times and
326 a median is determined. This patch adds initial support
327 for changing the calibration behavior for AR955x.
329 Also, to simplify things, a helper routine to issue/poll
330 AGC calibration is used.
332 For non-AR955x chips, the iqcal_idx (which will be used
333 in subsequent patches) is set to zero.
335 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
337 commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
338 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
339 Date: Fri Feb 7 10:29:52 2014 +0530
341 ath9k: Fix magnitude/phase calculation
343 Incorrect values are programmed in the registers
344 containing the IQ correction coefficients by the IQ-CAL
345 post-processing code. Fix this.
347 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
349 commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
350 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
351 Date: Fri Feb 7 10:29:51 2014 +0530
353 ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
355 Use ar9003_hw_tx_iq_cal_outlier_detection instead.
357 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
359 commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
360 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
361 Date: Fri Feb 7 10:29:50 2014 +0530
363 ath9k: Check explicitly for IQ calibration
365 In chips like AR955x, the initvals contain the information
366 whether IQ calibration is to be done in the HW when an
367 AGC calibration is triggered. Check if IQ-CAL is enabled
368 in the initvals before flagging 'txiqcal_done' as true.
370 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
372 commit cb4969634b93c4643a32cc3fbd27d2b288b25771
373 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
374 Date: Fri Feb 7 10:29:49 2014 +0530
376 ath9k: Fix IQ cal post processing for SoC
378 Calibration data is not reused for SoC chips, so
379 call ar9003_hw_tx_iq_cal_post_proc() with the correct
380 argument. The 'is_reusable' flag is currently used
381 only for PC-OEM chips, but it makes things clearer to
382 specify it explicity.
384 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
386 commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
387 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
388 Date: Mon Feb 3 13:31:37 2014 +0530
390 ath9k: Fix TX power calculation
392 The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
393 fixed the incorrect values in the eeprom templates, but if
394 boards have already been calibrated with incorrect values,
395 they would still be using the wrong TX power. Fix this by assigning
396 a default value in such cases.
398 Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
399 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
401 commit b9f268b5b01331c3c82179abca551429450e9417
402 Author: Michal Kazior <michal.kazior@tieto.com>
403 Date: Wed Jan 29 14:22:27 2014 +0100
405 cfg80211: consider existing DFS interfaces
407 It was possible to break interface combinations in
410 combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
411 combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
413 With the above interface combinations it was
416 step 1. start AP on DFS channel by matching combo 2
417 step 2. start AP on non-DFS channel by matching combo 1
419 This was possible beacuse (step 2) did not consider
420 if other interfaces require radar detection.
422 The patch changes how cfg80211 tracks channels -
423 instead of channel itself now a complete chandef
426 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
427 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
429 commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
430 Author: Antonio Quartulli <antonio@open-mesh.com>
431 Date: Wed Jan 29 17:53:43 2014 +0100
433 cfg80211: fix channel configuration in IBSS join
435 When receiving an IBSS_JOINED event select the BSS object
436 based on the {bssid, channel} couple rather than the bssid
438 With the current approach if another cell having the same
439 BSSID (but using a different channel) exists then cfg80211
440 picks up the wrong BSS object.
441 The result is a mismatching channel configuration between
442 cfg80211 and the driver, that can lead to any sort of
445 The issue can be triggered by having an IBSS sitting on
446 given channel and then asking the driver to create a new
447 cell using the same BSSID but with a different frequency.
448 By passing the channel to cfg80211_get_bss() we can solve
449 this ambiguity and retrieve/create the correct BSS object.
450 All the users of cfg80211_ibss_joined() have been changed
453 Moreover WARN when cfg80211_ibss_joined() gets a NULL
454 channel as argument and remove a bogus call of the same
455 function in ath6kl (it does not make sense to call
456 cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
458 Cc: Kalle Valo <kvalo@qca.qualcomm.com>
459 Cc: Arend van Spriel <arend@broadcom.com>
460 Cc: Bing Zhao <bzhao@marvell.com>
461 Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
462 Cc: libertas-dev@lists.infradead.org
463 Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
464 Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
465 [minor code cleanup in ath6kl]
466 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
468 commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
469 Author: Johannes Berg <johannes.berg@intel.com>
470 Date: Fri Jan 24 14:41:44 2014 +0100
472 mac80211: fix bufferable MMPDU RX handling
474 Action, disassoc and deauth frames are bufferable, and as such don't
475 have the PM bit in the frame control field reserved which means we
476 need to react to the bit when receiving in such a frame.
478 Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
479 and using it for the RX path that currently ignores the PM bit in
480 any non-data frames for doze->wake transitions, but listens to it in
481 all frames for wake->doze transitions, both of which are wrong.
483 Also use the new helper in the TX path to clean up the code.
485 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
487 commit fc0df6d2343636e3f48a069330d5b972e3d8659d
488 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
489 Date: Fri Jan 24 14:29:21 2014 +0100
491 cfg80211: set preset_chandef after channel switch
493 Set preset_chandef in channel switch notification.
494 In other case we will have old preset_chandef.
496 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
497 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
499 commit cdec895e2344987ff171cece96e25d7407a3ebf6
500 Author: Simon Wunderlich <simon@open-mesh.com>
501 Date: Fri Jan 24 23:48:29 2014 +0100
503 mac80211: send ibss probe responses with noack flag
505 Responding to probe requests for scanning clients will often create
506 excessive retries, as it happens quite often that the scanning client
507 already left the channel. Therefore do it like hostapd and send probe
508 responses for wildcard SSID only once by using the noack flag.
510 Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
511 [fix typo & 'wildcard SSID' in commit log]
512 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
514 commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
515 Author: Luciano Coelho <luciano.coelho@intel.com>
516 Date: Tue Jan 28 17:09:08 2014 +0200
518 mac80211: ibss: remove unnecessary call to release channel
520 The ieee80211_vif_use_channel() function calls
521 ieee80211_vif_release_channel(), so there's no need to call it
522 explicitly in __ieee80211_sta_join_ibss().
524 Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
525 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
527 commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
528 Author: Michal Kazior <michal.kazior@tieto.com>
529 Date: Wed Jan 29 07:56:21 2014 +0100
531 mac80211: add missing CSA locking
533 The patch adds a missing sdata lock and adds a few
534 lockdeps for easier maintenance.
536 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
537 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
539 commit ad17ba7d14d225b109b73c177cd446afb8050598
540 Author: Michal Kazior <michal.kazior@tieto.com>
541 Date: Wed Jan 29 07:56:20 2014 +0100
543 mac80211: fix sdata->radar_required locking
545 radar_required setting wasn't protected by
546 local->mtx in some places. This should prevent
547 from scanning/radar detection/roc colliding.
549 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
550 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
552 commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
553 Author: Michal Kazior <michal.kazior@tieto.com>
554 Date: Wed Jan 29 07:56:19 2014 +0100
556 mac80211: move csa_active setting in STA CSA
558 The sdata->vif.csa_active could be left set after,
559 e.g. channel context constraints check fail in STA
560 mode leaving the interface in a strange state for
561 a brief period of time until it is disconnected.
562 This was harmless but ugly.
564 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
565 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
566 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
568 commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
569 Author: Michal Kazior <michal.kazior@tieto.com>
570 Date: Wed Jan 29 07:56:18 2014 +0100
572 mac80211: fix possible memory leak on AP CSA failure
574 If CSA for AP interface failed and the interface
575 was not stopped afterwards another CSA request
576 would leak sdata->u.ap.next_beacon.
578 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
579 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
580 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
582 commit 3a77ba08940682bf3d52cf14f980337324af9d4a
583 Author: Johannes Berg <johannes.berg@intel.com>
584 Date: Sat Feb 1 00:33:29 2014 +0100
586 mac80211: fix fragmentation code, particularly for encryption
588 The "new" fragmentation code (since my rewrite almost 5 years ago)
589 erroneously sets skb->len rather than using skb_trim() to adjust
590 the length of the first fragment after copying out all the others.
591 This leaves the skb tail pointer pointing to after where the data
592 originally ended, and thus causes the encryption MIC to be written
593 at that point, rather than where it belongs: immediately after the
596 The impact of this is that if software encryption is done, then
597 a) encryption doesn't work for the first fragment, the connection
598 becomes unusable as the first fragment will never be properly
599 verified at the receiver, the MIC is practically guaranteed to
601 b) we leak up to 8 bytes of plaintext (!) of the packet out into
604 This is only mitigated by the fact that many devices are capable
605 of doing encryption in hardware, in which case this can't happen
606 as the tail pointer is irrelevant in that case. Additionally,
607 fragmentation is not used very frequently and would normally have
608 to be configured manually.
610 Fix this by using skb_trim() properly.
612 Cc: stable@vger.kernel.org
613 Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
614 Reported-by: Jouni Malinen <j@w1.fi>
615 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
617 commit de5f242e0c10e841017e37eb8c38974a642dbca8
618 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
619 Date: Tue Jan 28 06:21:59 2014 +0530
621 ath9k: Fix build error on ARM
623 Use mdelay instead of udelay to fix this error:
625 ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
626 make[1]: *** [__modpost] Error 1
627 make: *** [modules] Error 2
629 Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
630 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
632 commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
633 Author: Geert Uytterhoeven <geert@linux-m68k.org>
634 Date: Sun Jan 26 11:53:21 2014 +0100
636 ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
638 drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
639 drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
641 Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
642 optimize ath9k_flush").
644 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
646 commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
647 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
648 Date: Mon Jan 27 11:07:42 2014 +0200
650 mac80211: release the channel in error path in start_ap
652 When the driver cannot start the AP or when the assignement
653 of the beacon goes wrong, we need to unassign the vif.
655 Cc: stable@vger.kernel.org
656 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
657 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
659 commit dfb6889a75c601aedb7450b7e606668e77da6679
660 Author: Johannes Berg <johannes.berg@intel.com>
661 Date: Wed Jan 22 11:14:19 2014 +0200
663 cfg80211: send scan results from work queue
665 Due to the previous commit, when a scan finishes, it is in theory
666 possible to hit the following sequence:
667 1. interface starts being removed
668 2. scan is cancelled by driver and cfg80211 is notified
669 3. scan done work is scheduled
670 4. interface is removed completely, rdev->scan_req is freed,
671 event sent to userspace but scan done work remains pending
672 5. new scan is requested on another virtual interface
673 6. scan done work runs, freeing the still-running scan
675 To fix this situation, hang on to the scan done message and block
676 new scans while that is the case, and only send the message from
677 the work function, regardless of whether the scan_req is already
678 freed from interface removal. This makes step 5 above impossible
679 and changes step 6 to be
680 5. scan done work runs, sending the scan done message
682 As this can't work for wext, so we send the message immediately,
683 but this shouldn't be an issue since we still return -EBUSY.
685 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
687 commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
688 Author: Johannes Berg <johannes.berg@intel.com>
689 Date: Wed Jan 22 11:14:18 2014 +0200
691 cfg80211: fix scan done race
693 When an interface/wdev is removed, any ongoing scan should be
694 cancelled by the driver. This will make it call cfg80211, which
695 only queues a work struct. If interface/wdev removal is quick
696 enough, this can leave the scan request pending and processed
697 only after the interface is gone, causing a use-after-free.
699 Fix this by making sure the scan request is not pending after
700 the interface is destroyed. We can't flush or cancel the work
701 item due to locking concerns, but when it'll run it shouldn't
702 find anything to do. This leaves a potential issue, if a new
703 scan gets requested before the work runs, it prematurely stops
704 the running scan, potentially causing another crash. I'll fix
705 that in the next patch.
707 This was particularly observed with P2P_DEVICE wdevs, likely
708 because freeing them is quicker than freeing netdevs.
710 Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
711 Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
712 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
714 commit ae04fa489ab31b5a10d3cc8399f52761175d4321
715 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
716 Date: Thu Jan 23 14:28:16 2014 +0200
718 mac80211: avoid deadlock revealed by lockdep
720 sdata->u.ap.request_smps_work can’t be flushed synchronously
721 under wdev_lock(wdev) since ieee80211_request_smps_ap_work
722 itself locks the same lock.
723 While at it, reset the driver_smps_mode when the ap is
724 stopped to its default: OFF.
728 ======================================================
729 [ INFO: possible circular locking dependency detected ]
730 3.12.0-ipeer+ #2 Tainted: G O
731 -------------------------------------------------------
732 rmmod/2867 is trying to acquire lock:
733 ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
735 but task is already holding lock:
736 (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
738 which lock already depends on the new lock.
740 the existing dependency chain (in reverse order) is:
742 -> #1 (&wdev->mtx){+.+.+.}:
743 [<c10aefa9>] lock_acquire+0x79/0xe0
744 [<c1607a1a>] mutex_lock_nested+0x4a/0x360
745 [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
746 [<c105cdd8>] process_one_work+0x198/0x450
747 [<c105d469>] worker_thread+0xf9/0x320
748 [<c10669ff>] kthread+0x9f/0xb0
749 [<c1613397>] ret_from_kernel_thread+0x1b/0x28
751 -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
752 [<c10ae9df>] __lock_acquire+0x183f/0x1910
753 [<c10aefa9>] lock_acquire+0x79/0xe0
754 [<c105b917>] flush_work+0x47/0x90
755 [<c105d867>] __cancel_work_timer+0x67/0xe0
756 [<c105d90f>] cancel_work_sync+0xf/0x20
757 [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
758 [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
759 [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
760 [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
761 [<c160f2c9>] notifier_call_chain+0x59/0x130
762 [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
763 [<c106c70f>] raw_notifier_call_chain+0x1f/0x30
764 [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
765 [<c14f8263>] call_netdevice_notifiers+0x13/0x20
766 [<c14f82a4>] __dev_close_many+0x34/0xb0
767 [<c14f83fe>] dev_close_many+0x6e/0xc0
768 [<c14f9c77>] rollback_registered_many+0xa7/0x1f0
769 [<c14f9dd4>] unregister_netdevice_many+0x14/0x60
770 [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
771 [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
772 [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
773 [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
774 [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
775 [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
776 [<c10b8bf9>] SyS_delete_module+0x179/0x2b0
777 [<c1613421>] sysenter_do_call+0x12/0x32
779 Fixes: 687da132234f ("mac80211: implement SMPS for AP")
780 Cc: <stable@vger.kernel.org> [3.13]
781 Reported-by: Ilan Peer <ilan.peer@intel.com>
782 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
783 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
785 commit 178b205e96217164fd7c30113464250d0b6f5eca
786 Author: Johannes Berg <johannes.berg@intel.com>
787 Date: Thu Jan 23 16:32:29 2014 +0100
789 cfg80211: re-enable 5/10 MHz support
791 Unfortunately I forgot this during the merge window, but the
792 patch seems small enough to go in as a fix. The userspace API
793 bug that was the reason for disabling it has long been fixed.
795 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
797 commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
798 Author: Pontus Fuchs <pontus.fuchs@gmail.com>
799 Date: Thu Jan 16 15:00:40 2014 +0100
801 nl80211: Reset split_start when netlink skb is exhausted
803 When the netlink skb is exhausted split_start is left set. In the
804 subsequent retry, with a larger buffer, the dump is continued from the
805 failing point instead of from the beginning.
807 This was causing my rt28xx based USB dongle to now show up when
808 running "iw list" with an old iw version without split dump support.
810 Cc: stable@vger.kernel.org
811 Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
812 Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
813 [avoid the entire workaround when state->split is set]
814 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
816 commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
817 Author: Eliad Peller <eliad@wizery.com>
818 Date: Sun Jan 12 11:06:37 2014 +0200
820 mac80211: move roc cookie assignment earlier
822 ieee80211_start_roc_work() might add a new roc
823 to existing roc, and tell cfg80211 it has already
826 However, this might happen before the roc cookie
827 was set, resulting in REMAIN_ON_CHANNEL (started)
828 event with null cookie. Consequently, it can make
829 wpa_supplicant go out of sync.
831 Fix it by setting the roc cookie earlier.
833 Cc: stable@vger.kernel.org
834 Signed-off-by: Eliad Peller <eliad@wizery.com>
835 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
837 commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
838 Author: Johannes Berg <johannes.berg@intel.com>
839 Date: Fri Jan 24 14:06:29 2014 +0100
841 nl80211: send event when AP operation is stopped
843 There are a few cases, e.g. suspend, where an AP interface is
844 stopped by the kernel rather than by userspace request, most
845 commonly when suspending. To let userspace know about this,
846 send the NL80211_CMD_STOP_AP command as an event every time
847 an AP interface is stopped. This also happens when userspace
848 did in fact request the AP stop, but that's not a problem.
850 For full-MAC drivers this may need to be extended to also
851 cover cases where the device stopped the AP operation for
852 some reason, this a bit more complicated because then all
853 cfg80211 state also needs to be reset; such API is not part
856 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
858 commit d5d567eda7704f190379ca852a8f9a4112e3eee3
859 Author: Johannes Berg <johannes.berg@intel.com>
860 Date: Thu Jan 23 16:20:29 2014 +0100
862 mac80211: add length check in ieee80211_is_robust_mgmt_frame()
864 A few places weren't checking that the frame passed to the
865 function actually has enough data even though the function
866 clearly documents it must have a payload byte. Make this
867 safer by changing the function to take an skb and checking
868 the length inside. The old version is preserved for now as
869 the rtl* drivers use it and don't have a correct skb.
871 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
873 commit f8f6d212a047fc65c7d3442dfc038f65517236fc
874 Author: Johannes Berg <johannes.berg@intel.com>
875 Date: Fri Jan 24 10:53:53 2014 +0100
877 nl80211: fix scheduled scan RSSI matchset attribute confusion
879 The scheduled scan matchsets were intended to be a list of filters,
880 with the found BSS having to pass at least one of them to be passed
881 to the host. When the RSSI attribute was added, however, this was
882 broken and currently wpa_supplicant adds that attribute in its own
883 matchset; however, it doesn't intend that to mean that anything
884 that passes the RSSI filter should be passed to the host, instead
885 it wants it to mean that everything needs to also have higher RSSI.
887 This is semantically problematic because we have a list of filters
888 like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
889 one should be OR'ed and which one AND'ed.
891 To fix this, move the RSSI filter attribute into each matchset. As
892 we need to stay backward compatible, treat a matchset with only the
893 RSSI attribute as a "default RSSI filter" for all other matchsets,
894 but only if there are other matchsets (an RSSI-only matchset by
895 itself is still desirable.)
897 To make driver implementation easier, keep a global min_rssi_thold
898 for the entire request as well. The only affected driver is ath6kl.
900 I found this when I looked into the code after Raja Mani submitted
901 a patch fixing the n_match_sets calculation to disregard the RSSI,
902 but that patch didn't address the semantic issue.
904 Reported-by: Raja Mani <rmani@qti.qualcomm.com>
905 Acked-by: Luciano Coelho <luciano.coelho@intel.com>
906 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
908 commit de553e8545e65a6dc4e45f43df7e1443d4291922
909 Author: Johannes Berg <johannes.berg@intel.com>
910 Date: Fri Jan 24 10:17:47 2014 +0100
912 nl80211: check nla_parse() return values
914 If there's a policy, then nla_parse() return values must be
915 checked, otherwise the policy is useless and there's nothing
916 that ensures the attributes are actually what we expect them
919 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
921 commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
922 Author: Karl Beldan <karl.beldan@rivierawaves.com>
923 Date: Thu Jan 23 20:06:34 2014 +0100
925 mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
927 ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
928 the BA parameters. In the discussion [1] about this patch, Johannes
929 recalled that it fixed some races with the DELBA and indeed this
930 behavior was introduced in [2].
931 While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
932 their BA params TID AC violates the spec and is more a workaround for
933 some drivers. Helmut expressed some concerns wrt such drivers, in
934 particular DELBAs in rt2x00.
936 ATM, DELBAs are sent after a driver has called (hence "purposely")
937 ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
938 details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
939 given to the driver ampdu_action supposed to call this function, which
940 could prove handy to people trying to do the right thing in faulty
941 drivers (if their fw/hw don't get in their way).
943 [1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
944 [2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
946 Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
947 Cc: Helmut Schaa <helmut.schaa@googlemail.com>
948 Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
949 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
950 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
951 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
952 @@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
953 if (nw_type & ADHOC_NETWORK) {
954 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
955 nw_type & ADHOC_CREATOR ? "creator" : "joiner");
956 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
957 + cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
958 cfg80211_put_bss(ar->wiphy, bss);
961 @@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
964 if (vif->nw_type & ADHOC_NETWORK) {
965 - if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
966 + if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
967 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
968 "%s: ath6k not in ibss mode\n", __func__);
971 - memset(bssid, 0, ETH_ALEN);
972 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
976 @@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
977 struct ath6kl_vif *vif = netdev_priv(dev);
980 + int n_match_sets = request->n_match_sets;
983 + * If there's a matchset w/o an SSID, then assume it's just for
984 + * the RSSI (nothing else is currently supported) and ignore it.
985 + * The device only supports a global RSSI filter that we set below.
987 + if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
990 if (ar->state != ATH6KL_STATE_ON)
992 @@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
993 ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
996 - request->n_match_sets);
1001 - if (!request->n_match_sets) {
1002 + if (!n_match_sets) {
1003 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
1006 @@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
1008 if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
1009 ar->fw_capabilities)) {
1010 - if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1011 + if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1013 - else if (request->rssi_thold < -127)
1014 + else if (request->min_rssi_thold < -127)
1017 - rssi_thold = request->rssi_thold;
1018 + rssi_thold = request->min_rssi_thold;
1020 ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
1022 --- a/drivers/net/wireless/ath/ath9k/hw.c
1023 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1024 @@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
1025 if (AR_SREV_9300_20_OR_LATER(ah))
1027 else if (AR_SREV_9100(ah))
1033 @@ -2051,9 +2051,8 @@ static bool ath9k_hw_set_power_awake(str
1035 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
1036 AR_RTC_FORCE_WAKE_EN);
1038 if (AR_SREV_9100(ah))
1044 --- a/drivers/net/wireless/ath/ath9k/main.c
1045 +++ b/drivers/net/wireless/ath/ath9k/main.c
1046 @@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
1048 static bool ath9k_has_tx_pending(struct ath_softc *sc)
1053 for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1054 if (!ATH_TXQ_SETUP(sc, i))
1055 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
1056 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
1057 @@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
1058 * config match list.
1060 for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
1061 + /* skip empty SSID matchsets */
1062 + if (!req->match_sets[i].ssid.ssid_len)
1064 scan->direct_scan[i].id = WLAN_EID_SSID;
1065 scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
1066 memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
1067 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1068 +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1069 @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
1070 /* During testing, hdr was NULL */
1073 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1074 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1075 (ieee80211_has_protected(hdr->frame_control)))
1076 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1078 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1079 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1080 @@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
1081 /* In testing, hdr was NULL here */
1084 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1085 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1086 (ieee80211_has_protected(hdr->frame_control)))
1087 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1089 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1090 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1091 @@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
1092 /* during testing, hdr was NULL here */
1095 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1096 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1097 (ieee80211_has_protected(hdr->frame_control)))
1098 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1100 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1101 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1102 @@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
1103 /* during testing, hdr could be NULL here */
1106 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1107 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1108 (ieee80211_has_protected(hdr->frame_control)))
1109 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1111 --- a/include/linux/ieee80211.h
1112 +++ b/include/linux/ieee80211.h
1113 @@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
1117 + * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
1118 + * @fc: frame control field in little-endian byteorder
1120 +static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
1122 + /* IEEE 802.11-2012, definition of "bufferable management frame";
1123 + * note that this ignores the IBSS special case. */
1124 + return ieee80211_is_mgmt(fc) &&
1125 + (ieee80211_is_action(fc) ||
1126 + ieee80211_is_disassoc(fc) ||
1127 + ieee80211_is_deauth(fc));
1131 * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
1132 * @seq_ctrl: frame sequence control bytes in little-endian byteorder
1134 @@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
1138 - * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1139 + * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1140 * @hdr: the frame (buffer must include at least the first octet of payload)
1142 -static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1143 +static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1145 if (ieee80211_is_disassoc(hdr->frame_control) ||
1146 ieee80211_is_deauth(hdr->frame_control))
1147 @@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
1151 + * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
1152 + * @skb: the skb containing the frame, length will be checked
1154 +static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
1156 + if (skb->len < 25)
1158 + return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
1162 * ieee80211_is_public_action - check if frame is a public action frame
1164 * @len: length of the frame
1165 --- a/include/net/cfg80211.h
1166 +++ b/include/net/cfg80211.h
1167 @@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
1168 * struct cfg80211_match_set - sets of attributes to match
1170 * @ssid: SSID to be matched
1171 + * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1173 struct cfg80211_match_set {
1174 struct cfg80211_ssid ssid;
1179 @@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
1180 * @dev: the interface
1181 * @scan_start: start time of the scheduled scan
1182 * @channels: channels to scan
1183 - * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1184 + * @min_rssi_thold: for drivers only supporting a single threshold, this
1185 + * contains the minimum over all matchsets
1187 struct cfg80211_sched_scan_request {
1188 struct cfg80211_ssid *ssids;
1189 @@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
1191 struct cfg80211_match_set *match_sets;
1194 + s32 min_rssi_thold;
1197 struct wiphy *wiphy;
1198 @@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
1199 * @identifier: (private) Identifier used in nl80211 to identify this
1200 * wireless device if it has no netdev
1201 * @current_bss: (private) Used by the internal configuration code
1202 - * @channel: (private) Used by the internal configuration code to track
1203 - * the user-set AP, monitor and WDS channel
1204 + * @chandef: (private) Used by the internal configuration code to track
1205 + * the user-set channel definition.
1206 * @preset_chandef: (private) Used by the internal configuration code to
1207 * track the channel to be used for AP later
1208 * @bssid: (private) Used by the internal configuration code
1209 @@ -3195,9 +3198,7 @@ struct wireless_dev {
1211 struct cfg80211_internal_bss *current_bss; /* associated / joined */
1212 struct cfg80211_chan_def preset_chandef;
1214 - /* for AP and mesh channel tracking */
1215 - struct ieee80211_channel *channel;
1216 + struct cfg80211_chan_def chandef;
1219 bool ibss_dfs_possible;
1220 @@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
1222 * @dev: network device
1223 * @bssid: the BSSID of the IBSS joined
1224 + * @channel: the channel of the IBSS joined
1225 * @gfp: allocation flags
1227 * This function notifies cfg80211 that the device joined an IBSS or
1228 @@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
1229 * with the locally generated beacon -- this guarantees that there is
1230 * always a scan result for this IBSS. cfg80211 will handle the rest.
1232 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
1233 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1234 + struct ieee80211_channel *channel, gfp_t gfp);
1237 * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
1238 --- a/include/uapi/linux/nl80211.h
1239 +++ b/include/uapi/linux/nl80211.h
1240 @@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
1241 * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
1242 * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
1243 * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
1244 - * only report BSS with matching SSID.
1245 + * only report BSS with matching SSID.
1246 * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
1247 - * BSS in scan results. Filtering is turned off if not specified.
1248 + * BSS in scan results. Filtering is turned off if not specified. Note that
1249 + * if this attribute is in a match set of its own, then it is treated as
1250 + * the default value for all matchsets with an SSID, rather than being a
1251 + * matchset of its own without an RSSI filter. This is due to problems with
1252 + * how this API was implemented in the past. Also, due to the same problem,
1253 + * the only way to create a matchset with only an RSSI filter (with this
1254 + * attribute) is if there's only a single matchset with the RSSI attribute.
1255 * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
1256 * attribute number currently defined
1257 * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
1258 --- a/net/mac80211/agg-tx.c
1259 +++ b/net/mac80211/agg-tx.c
1260 @@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
1261 mgmt->u.action.u.addba_req.start_seq_num =
1262 cpu_to_le16(start_seq_num << 4);
1264 - ieee80211_tx_skb_tid(sdata, skb, tid);
1265 + ieee80211_tx_skb(sdata, skb);
1268 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
1269 --- a/net/mac80211/cfg.c
1270 +++ b/net/mac80211/cfg.c
1271 @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
1272 /* TODO: make hostapd tell us what it wants */
1273 sdata->smps_mode = IEEE80211_SMPS_OFF;
1274 sdata->needed_rx_chains = sdata->local->rx_chains;
1275 - sdata->radar_required = params->radar_required;
1277 mutex_lock(&local->mtx);
1278 + sdata->radar_required = params->radar_required;
1279 err = ieee80211_vif_use_channel(sdata, ¶ms->chandef,
1280 IEEE80211_CHANCTX_SHARED);
1281 mutex_unlock(&local->mtx);
1282 @@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
1283 IEEE80211_P2P_OPPPS_ENABLE_BIT;
1285 err = ieee80211_assign_beacon(sdata, ¶ms->beacon);
1288 + ieee80211_vif_release_channel(sdata);
1293 err = drv_start_ap(sdata->local, sdata);
1294 @@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
1296 kfree_rcu(old, rcu_head);
1297 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
1298 + ieee80211_vif_release_channel(sdata);
1302 @@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
1305 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
1306 + sdata_assert_lock(sdata);
1308 /* don't allow changing the beacon while CSA is in place - offset
1309 * of channel switch counter may change
1310 @@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
1311 struct probe_resp *old_probe_resp;
1312 struct cfg80211_chan_def chandef;
1314 + sdata_assert_lock(sdata);
1316 old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
1319 @@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
1320 kfree(sdata->u.ap.next_beacon);
1321 sdata->u.ap.next_beacon = NULL;
1323 - cancel_work_sync(&sdata->u.ap.request_smps_work);
1325 /* turn off carrier for this interface and dependent VLANs */
1326 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1327 netif_carrier_off(vlan->dev);
1328 @@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
1329 kfree_rcu(old_beacon, rcu_head);
1331 kfree_rcu(old_probe_resp, rcu_head);
1332 + sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
1334 __sta_info_flush(sdata, true);
1335 ieee80211_free_keys(sdata, true);
1336 @@ -2638,6 +2643,24 @@ static int ieee80211_start_roc_work(stru
1337 INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
1338 INIT_LIST_HEAD(&roc->dependents);
1341 + * cookie is either the roc cookie (for normal roc)
1342 + * or the SKB (for mgmt TX)
1345 + /* local->mtx protects this */
1346 + local->roc_cookie_counter++;
1347 + roc->cookie = local->roc_cookie_counter;
1348 + /* wow, you wrapped 64 bits ... more likely a bug */
1349 + if (WARN_ON(roc->cookie == 0)) {
1351 + local->roc_cookie_counter++;
1353 + *cookie = roc->cookie;
1355 + *cookie = (unsigned long)txskb;
1358 /* if there's one pending or we're scanning, queue this one */
1359 if (!list_empty(&local->roc_list) ||
1360 local->scanning || local->radar_detect_enabled)
1361 @@ -2772,24 +2795,6 @@ static int ieee80211_start_roc_work(stru
1363 list_add_tail(&roc->list, &local->roc_list);
1366 - * cookie is either the roc cookie (for normal roc)
1367 - * or the SKB (for mgmt TX)
1370 - /* local->mtx protects this */
1371 - local->roc_cookie_counter++;
1372 - roc->cookie = local->roc_cookie_counter;
1373 - /* wow, you wrapped 64 bits ... more likely a bug */
1374 - if (WARN_ON(roc->cookie == 0)) {
1376 - local->roc_cookie_counter++;
1378 - *cookie = roc->cookie;
1380 - *cookie = (unsigned long)txskb;
1386 @@ -3004,8 +3009,10 @@ void ieee80211_csa_finalize_work(struct
1387 if (!ieee80211_sdata_running(sdata))
1390 - sdata->radar_required = sdata->csa_radar_required;
1391 + sdata_assert_lock(sdata);
1393 mutex_lock(&local->mtx);
1394 + sdata->radar_required = sdata->csa_radar_required;
1395 err = ieee80211_vif_change_channel(sdata, &changed);
1396 mutex_unlock(&local->mtx);
1397 if (WARN_ON(err < 0))
1398 @@ -3022,13 +3029,13 @@ void ieee80211_csa_finalize_work(struct
1399 switch (sdata->vif.type) {
1400 case NL80211_IFTYPE_AP:
1401 err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
1402 + kfree(sdata->u.ap.next_beacon);
1403 + sdata->u.ap.next_beacon = NULL;
1409 - kfree(sdata->u.ap.next_beacon);
1410 - sdata->u.ap.next_beacon = NULL;
1412 ieee80211_bss_info_change_notify(sdata, err);
1414 case NL80211_IFTYPE_ADHOC:
1415 @@ -3066,7 +3073,7 @@ int ieee80211_channel_switch(struct wiph
1416 struct ieee80211_if_mesh __maybe_unused *ifmsh;
1417 int err, num_chanctx;
1419 - lockdep_assert_held(&sdata->wdev.mtx);
1420 + sdata_assert_lock(sdata);
1422 if (!list_empty(&local->roc_list) || local->scanning)
1424 --- a/net/mac80211/ht.c
1425 +++ b/net/mac80211/ht.c
1426 @@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
1427 mgmt->u.action.u.delba.params = cpu_to_le16(params);
1428 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
1430 - ieee80211_tx_skb_tid(sdata, skb, tid);
1431 + ieee80211_tx_skb(sdata, skb);
1434 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
1435 @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
1436 u.ap.request_smps_work);
1439 - __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
1440 + if (sdata_dereference(sdata->u.ap.beacon, sdata))
1441 + __ieee80211_request_smps_ap(sdata,
1442 + sdata->u.ap.driver_smps_mode);
1443 sdata_unlock(sdata);
1446 --- a/net/mac80211/iface.c
1447 +++ b/net/mac80211/iface.c
1448 @@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
1450 ieee80211_roc_purge(local, sdata);
1452 - if (sdata->vif.type == NL80211_IFTYPE_STATION)
1453 + switch (sdata->vif.type) {
1454 + case NL80211_IFTYPE_STATION:
1455 ieee80211_mgd_stop(sdata);
1457 - if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
1459 + case NL80211_IFTYPE_ADHOC:
1460 ieee80211_ibss_stop(sdata);
1463 + case NL80211_IFTYPE_AP:
1464 + cancel_work_sync(&sdata->u.ap.request_smps_work);
1471 * Remove all stations associated with this interface.
1472 @@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
1473 cancel_work_sync(&local->dynamic_ps_enable_work);
1475 cancel_work_sync(&sdata->recalc_smps);
1476 + sdata_lock(sdata);
1477 sdata->vif.csa_active = false;
1478 + sdata_unlock(sdata);
1479 cancel_work_sync(&sdata->csa_finalize_work);
1481 cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
1482 --- a/net/mac80211/rx.c
1483 +++ b/net/mac80211/rx.c
1484 @@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
1486 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1488 - if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
1489 + if (is_multicast_ether_addr(hdr->addr1))
1492 - return ieee80211_is_robust_mgmt_frame(hdr);
1493 + return ieee80211_is_robust_mgmt_frame(skb);
1497 @@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
1499 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1501 - if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
1502 + if (!is_multicast_ether_addr(hdr->addr1))
1505 - return ieee80211_is_robust_mgmt_frame(hdr);
1506 + return ieee80211_is_robust_mgmt_frame(skb);
1510 @@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
1511 if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
1514 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
1515 + if (!ieee80211_is_robust_mgmt_frame(skb))
1516 return -1; /* not a robust management frame */
1518 mmie = (struct ieee80211_mmie *)
1519 @@ -1128,6 +1128,13 @@ static void sta_ps_end(struct sta_info *
1520 sta->sta.addr, sta->sta.aid);
1522 if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1524 + * Clear the flag only if the other one is still set
1525 + * so that the TX path won't start TX'ing new frames
1526 + * directly ... In the case that the driver flag isn't
1527 + * set ieee80211_sta_ps_deliver_wakeup() will clear it.
1529 + clear_sta_flag(sta, WLAN_STA_PS_STA);
1530 ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
1531 sta->sta.addr, sta->sta.aid);
1533 @@ -1311,18 +1318,15 @@ ieee80211_rx_h_sta_process(struct ieee80
1534 !ieee80211_has_morefrags(hdr->frame_control) &&
1535 !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
1536 (rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1537 - rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
1538 + rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1539 + /* PM bit is only checked in frames where it isn't reserved,
1540 + * in AP mode it's reserved in non-bufferable management frames
1541 + * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1543 + (!ieee80211_is_mgmt(hdr->frame_control) ||
1544 + ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1545 if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
1547 - * Ignore doze->wake transitions that are
1548 - * indicated by non-data frames, the standard
1549 - * is unclear here, but for example going to
1550 - * PS mode and then scanning would cause a
1551 - * doze->wake transition for the probe request,
1552 - * and that is clearly undesirable.
1554 - if (ieee80211_is_data(hdr->frame_control) &&
1555 - !ieee80211_has_pm(hdr->frame_control))
1556 + if (!ieee80211_has_pm(hdr->frame_control))
1559 if (ieee80211_has_pm(hdr->frame_control))
1560 @@ -1845,8 +1849,7 @@ static int ieee80211_drop_unencrypted_mg
1561 * having configured keys.
1563 if (unlikely(ieee80211_is_action(fc) && !rx->key &&
1564 - ieee80211_is_robust_mgmt_frame(
1565 - (struct ieee80211_hdr *) rx->skb->data)))
1566 + ieee80211_is_robust_mgmt_frame(rx->skb)))
1570 --- a/net/mac80211/tx.c
1571 +++ b/net/mac80211/tx.c
1572 @@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc,
1573 if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
1576 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
1578 + if (!ieee80211_is_robust_mgmt_frame(skb))
1582 @@ -478,6 +477,20 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1583 sta->sta.addr, sta->sta.aid, ac);
1584 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
1585 purge_old_ps_buffers(tx->local);
1587 + /* sync with ieee80211_sta_ps_deliver_wakeup */
1588 + spin_lock(&sta->ps_lock);
1590 + * STA woke up the meantime and all the frames on ps_tx_buf have
1591 + * been queued to pending queue. No reordering can happen, go
1592 + * ahead and Tx the packet.
1594 + if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
1595 + !test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1596 + spin_unlock(&sta->ps_lock);
1597 + return TX_CONTINUE;
1600 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
1601 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
1603 @@ -492,6 +505,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1604 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
1605 info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
1606 skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb);
1607 + spin_unlock(&sta->ps_lock);
1609 if (!timer_pending(&local->sta_cleanup))
1610 mod_timer(&local->sta_cleanup,
1611 @@ -525,9 +539,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
1613 /* only deauth, disassoc and action are bufferable MMPDUs */
1614 if (ieee80211_is_mgmt(hdr->frame_control) &&
1615 - !ieee80211_is_deauth(hdr->frame_control) &&
1616 - !ieee80211_is_disassoc(hdr->frame_control) &&
1617 - !ieee80211_is_action(hdr->frame_control)) {
1618 + !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
1619 if (tx->flags & IEEE80211_TX_UNICAST)
1620 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1622 @@ -567,7 +579,7 @@ ieee80211_tx_h_select_key(struct ieee802
1624 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1625 is_multicast_ether_addr(hdr->addr1) &&
1626 - ieee80211_is_robust_mgmt_frame(hdr) &&
1627 + ieee80211_is_robust_mgmt_frame(tx->skb) &&
1628 (key = rcu_dereference(tx->sdata->default_mgmt_key)))
1630 else if (is_multicast_ether_addr(hdr->addr1) &&
1631 @@ -582,12 +594,12 @@ ieee80211_tx_h_select_key(struct ieee802
1633 else if (tx->skb->protocol == tx->sdata->control_port_protocol)
1635 - else if (ieee80211_is_robust_mgmt_frame(hdr) &&
1636 + else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
1637 !(ieee80211_is_action(hdr->frame_control) &&
1638 tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
1640 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1641 - !ieee80211_is_robust_mgmt_frame(hdr))
1642 + !ieee80211_is_robust_mgmt_frame(tx->skb))
1645 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
1646 @@ -878,7 +890,7 @@ static int ieee80211_fragment(struct iee
1649 /* adjust first fragment's length */
1650 - skb->len = hdrlen + per_fragm;
1651 + skb_trim(skb, hdrlen + per_fragm);
1655 --- a/net/mac80211/wpa.c
1656 +++ b/net/mac80211/wpa.c
1657 @@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
1658 hdrlen = ieee80211_hdrlen(hdr->frame_control);
1660 if (!ieee80211_is_data(hdr->frame_control) &&
1661 - !ieee80211_is_robust_mgmt_frame(hdr))
1662 + !ieee80211_is_robust_mgmt_frame(skb))
1665 data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
1666 --- a/net/wireless/ap.c
1667 +++ b/net/wireless/ap.c
1668 @@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
1669 err = rdev_stop_ap(rdev, dev);
1671 wdev->beacon_interval = 0;
1672 - wdev->channel = NULL;
1673 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
1675 rdev_set_qos_map(rdev, dev, NULL);
1676 + nl80211_send_ap_stopped(wdev);
1680 --- a/net/wireless/core.c
1681 +++ b/net/wireless/core.c
1682 @@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
1686 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1687 - !rdev->scan_req->notified);
1688 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1689 + if (WARN_ON(!rdev->scan_req->notified))
1690 + rdev->scan_req->aborted = true;
1691 + ___cfg80211_scan_done(rdev, false);
1695 static int cfg80211_rfkill_set_block(void *data, bool blocked)
1696 @@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
1698 u16 ifmodes = wiphy->interface_modes;
1700 - /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
1701 - wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
1704 * There are major locking problems in nl80211/mac80211 for CSA,
1705 * disable for all drivers until this has been reworked.
1706 @@ -875,8 +875,11 @@ static int cfg80211_netdev_notifier_call
1709 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
1710 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1711 - !rdev->scan_req->notified);
1712 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1713 + if (WARN_ON(!rdev->scan_req->notified))
1714 + rdev->scan_req->aborted = true;
1715 + ___cfg80211_scan_done(rdev, false);
1718 if (WARN_ON(rdev->sched_scan_req &&
1719 rdev->sched_scan_req->dev == wdev->netdev)) {
1720 --- a/net/wireless/core.h
1721 +++ b/net/wireless/core.h
1722 @@ -62,6 +62,7 @@ struct cfg80211_registered_device {
1723 struct rb_root bss_tree;
1725 struct cfg80211_scan_request *scan_req; /* protected by RTNL */
1726 + struct sk_buff *scan_msg;
1727 struct cfg80211_sched_scan_request *sched_scan_req;
1728 unsigned long suspend_at;
1729 struct work_struct scan_done_wk;
1730 @@ -210,6 +211,7 @@ struct cfg80211_event {
1734 + struct ieee80211_channel *channel;
1738 @@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
1739 struct net_device *dev, bool nowext);
1740 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
1741 struct net_device *dev, bool nowext);
1742 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
1743 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1744 + struct ieee80211_channel *channel);
1745 int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
1746 struct wireless_dev *wdev);
1748 @@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
1749 struct key_params *params, int key_idx,
1750 bool pairwise, const u8 *mac_addr);
1751 void __cfg80211_scan_done(struct work_struct *wk);
1752 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
1753 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
1754 + bool send_message);
1755 void __cfg80211_sched_scan_results(struct work_struct *wk);
1756 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
1757 bool driver_initiated);
1758 @@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
1760 cfg80211_get_chan_state(struct wireless_dev *wdev,
1761 struct ieee80211_channel **chan,
1762 - enum cfg80211_chan_mode *chanmode);
1763 + enum cfg80211_chan_mode *chanmode,
1764 + u8 *radar_detect);
1766 int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
1767 struct cfg80211_chan_def *chandef);
1768 --- a/net/wireless/nl80211.c
1769 +++ b/net/wireless/nl80211.c
1770 @@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
1771 * We can then retry with the larger buffer.
1773 if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
1775 + !skb->len && !state->split &&
1776 cb->min_dump_alloc < 4096) {
1777 cb->min_dump_alloc = 4096;
1778 + state->split_start = 0;
1782 @@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
1783 nla_for_each_nested(nl_txq_params,
1784 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
1786 - nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1787 - nla_data(nl_txq_params),
1788 - nla_len(nl_txq_params),
1789 - txq_params_policy);
1790 + result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1791 + nla_data(nl_txq_params),
1792 + nla_len(nl_txq_params),
1793 + txq_params_policy);
1796 result = parse_txq_params(tb, &txq_params);
1799 @@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
1801 wdev->preset_chandef = params.chandef;
1802 wdev->beacon_interval = params.beacon_interval;
1803 - wdev->channel = params.chandef.chan;
1804 + wdev->chandef = params.chandef;
1805 wdev->ssid_len = params.ssid_len;
1806 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
1808 @@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
1810 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
1812 - nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1813 - nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1815 + r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1816 + nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1820 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
1823 @@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
1824 if (!rdev->ops->scan)
1827 - if (rdev->scan_req) {
1828 + if (rdev->scan_req || rdev->scan_msg) {
1832 @@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
1833 enum ieee80211_band band;
1835 struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
1836 + s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
1838 if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
1839 !rdev->ops->sched_scan_start)
1840 @@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
1841 if (n_ssids > wiphy->max_sched_scan_ssids)
1844 - if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
1846 + * First, count the number of 'real' matchsets. Due to an issue with
1847 + * the old implementation, matchsets containing only the RSSI attribute
1848 + * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
1849 + * RSSI for all matchsets, rather than their own matchset for reporting
1850 + * all APs with a strong RSSI. This is needed to be compatible with
1851 + * older userspace that treated a matchset with only the RSSI as the
1852 + * global RSSI for all other matchsets - if there are other matchsets.
1854 + if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
1855 nla_for_each_nested(attr,
1856 info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
1860 + struct nlattr *rssi;
1862 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1863 + nla_data(attr), nla_len(attr),
1864 + nl80211_match_policy);
1867 + /* add other standalone attributes here */
1868 + if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
1872 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1874 + default_match_rssi = nla_get_s32(rssi);
1878 + /* However, if there's no other matchset, add the RSSI one */
1879 + if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
1882 if (n_match_sets > wiphy->max_match_sets)
1884 @@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
1886 struct nlattr *ssid, *rssi;
1888 - nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1889 - nla_data(attr), nla_len(attr),
1890 - nl80211_match_policy);
1891 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1892 + nla_data(attr), nla_len(attr),
1893 + nl80211_match_policy);
1896 ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
1898 + if (WARN_ON(i >= n_match_sets)) {
1899 + /* this indicates a programming error,
1900 + * the loop above should have verified
1907 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
1910 @@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
1911 nla_data(ssid), nla_len(ssid));
1912 request->match_sets[i].ssid.ssid_len =
1914 + /* special attribute - old implemenation w/a */
1915 + request->match_sets[i].rssi_thold =
1916 + default_match_rssi;
1917 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1919 + request->match_sets[i].rssi_thold =
1920 + nla_get_s32(rssi);
1922 - rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1924 - request->rssi_thold = nla_get_u32(rssi);
1926 - request->rssi_thold =
1927 - NL80211_SCAN_RSSI_THOLD_OFF;
1931 + /* there was no other matchset, so the RSSI one is alone */
1933 + request->match_sets[0].rssi_thold = default_match_rssi;
1935 + request->min_rssi_thold = INT_MAX;
1936 + for (i = 0; i < n_match_sets; i++)
1937 + request->min_rssi_thold =
1938 + min(request->match_sets[i].rssi_thold,
1939 + request->min_rssi_thold);
1941 + request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
1944 if (info->attrs[NL80211_ATTR_IE]) {
1945 @@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
1947 err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
1949 - wdev->channel = chandef.chan;
1950 + wdev->chandef = chandef;
1951 wdev->cac_started = true;
1952 wdev->cac_start_time = jiffies;
1954 @@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
1955 * directly to the enum ieee80211_band values used in cfg80211.
1957 BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
1958 - nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
1960 + nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
1961 enum ieee80211_band band = nla_type(tx_rates);
1964 if (band < 0 || band >= IEEE80211_NUM_BANDS)
1966 sband = rdev->wiphy.bands[band];
1969 - nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
1970 - nla_len(tx_rates), nl80211_txattr_policy);
1971 + err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
1972 + nla_len(tx_rates), nl80211_txattr_policy);
1975 if (tb[NL80211_TXRATE_LEGACY]) {
1976 mask.control[band].legacy = rateset_to_mask(
1978 @@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
1979 NL80211_MCGRP_SCAN, GFP_KERNEL);
1982 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
1983 - struct wireless_dev *wdev)
1984 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
1985 + struct wireless_dev *wdev, bool aborted)
1987 struct sk_buff *msg;
1989 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1994 if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
1995 - NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
1996 + aborted ? NL80211_CMD_SCAN_ABORTED :
1997 + NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2003 - genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2004 - NL80211_MCGRP_SCAN, GFP_KERNEL);
2008 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2009 - struct wireless_dev *wdev)
2010 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2011 + struct sk_buff *msg)
2013 - struct sk_buff *msg;
2015 - msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2019 - if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2020 - NL80211_CMD_SCAN_ABORTED) < 0) {
2025 genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2026 NL80211_MCGRP_SCAN, GFP_KERNEL);
2028 @@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
2029 wdev->iftype != NL80211_IFTYPE_MESH_POINT))
2032 - wdev->channel = chandef->chan;
2033 + wdev->chandef = *chandef;
2034 + wdev->preset_chandef = *chandef;
2035 nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
2037 EXPORT_SYMBOL(cfg80211_ch_switch_notify);
2038 @@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct
2040 EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
2042 +void nl80211_send_ap_stopped(struct wireless_dev *wdev)
2044 + struct wiphy *wiphy = wdev->wiphy;
2045 + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
2046 + struct sk_buff *msg;
2049 + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2053 + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
2057 + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
2058 + nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
2059 + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
2062 + genlmsg_end(msg, hdr);
2064 + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
2065 + NL80211_MCGRP_MLME, GFP_KERNEL);
2071 /* initialisation/exit functions */
2073 int nl80211_init(void)
2074 --- a/net/wireless/nl80211.h
2075 +++ b/net/wireless/nl80211.h
2076 @@ -8,10 +8,10 @@ void nl80211_exit(void);
2077 void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
2078 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
2079 struct wireless_dev *wdev);
2080 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2081 - struct wireless_dev *wdev);
2082 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2083 - struct wireless_dev *wdev);
2084 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2085 + struct wireless_dev *wdev, bool aborted);
2086 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2087 + struct sk_buff *msg);
2088 void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
2089 struct net_device *netdev, u32 cmd);
2090 void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
2091 @@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
2092 enum nl80211_radar_event event,
2093 struct net_device *netdev, gfp_t gfp);
2095 +void nl80211_send_ap_stopped(struct wireless_dev *wdev);
2097 void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
2099 #endif /* __NET_WIRELESS_NL80211_H */
2100 --- a/net/wireless/scan.c
2101 +++ b/net/wireless/scan.c
2102 @@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
2103 dev->bss_generation++;
2106 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
2107 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2108 + bool send_message)
2110 struct cfg80211_scan_request *request;
2111 struct wireless_dev *wdev;
2112 + struct sk_buff *msg;
2113 #ifdef CPTCFG_CFG80211_WEXT
2114 union iwreq_data wrqu;
2119 - request = rdev->scan_req;
2120 + if (rdev->scan_msg) {
2121 + nl80211_send_scan_result(rdev, rdev->scan_msg);
2122 + rdev->scan_msg = NULL;
2126 + request = rdev->scan_req;
2130 @@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
2132 cfg80211_sme_scan_done(wdev->netdev);
2134 - if (request->aborted) {
2135 - nl80211_send_scan_aborted(rdev, wdev);
2137 - if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
2138 - /* flush entries from previous scans */
2139 - spin_lock_bh(&rdev->bss_lock);
2140 - __cfg80211_bss_expire(rdev, request->scan_start);
2141 - spin_unlock_bh(&rdev->bss_lock);
2143 - nl80211_send_scan_done(rdev, wdev);
2144 + if (!request->aborted &&
2145 + request->flags & NL80211_SCAN_FLAG_FLUSH) {
2146 + /* flush entries from previous scans */
2147 + spin_lock_bh(&rdev->bss_lock);
2148 + __cfg80211_bss_expire(rdev, request->scan_start);
2149 + spin_unlock_bh(&rdev->bss_lock);
2152 + msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
2154 #ifdef CPTCFG_CFG80211_WEXT
2155 if (wdev->netdev && !request->aborted) {
2156 memset(&wrqu, 0, sizeof(wrqu));
2157 @@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
2159 rdev->scan_req = NULL;
2162 + if (!send_message)
2163 + rdev->scan_msg = msg;
2165 + nl80211_send_scan_result(rdev, msg);
2168 void __cfg80211_scan_done(struct work_struct *wk)
2169 @@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
2173 - ___cfg80211_scan_done(rdev);
2174 + ___cfg80211_scan_done(rdev, true);
2178 @@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
2180 return PTR_ERR(rdev);
2182 - if (rdev->scan_req) {
2183 + if (rdev->scan_req || rdev->scan_msg) {
2187 @@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
2189 return PTR_ERR(rdev);
2191 - if (rdev->scan_req)
2192 + if (rdev->scan_req || rdev->scan_msg)
2195 res = ieee80211_scan_results(rdev, info, extra, data->length);
2196 --- a/net/wireless/sme.c
2197 +++ b/net/wireless/sme.c
2198 @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
2199 ASSERT_RDEV_LOCK(rdev);
2200 ASSERT_WDEV_LOCK(wdev);
2202 - if (rdev->scan_req)
2203 + if (rdev->scan_req || rdev->scan_msg)
2206 if (wdev->conn->params.channel)
2207 --- a/net/mac80211/mlme.c
2208 +++ b/net/mac80211/mlme.c
2209 @@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct
2212 ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
2213 - sdata->vif.csa_active = true;
2215 mutex_lock(&local->chanctx_mtx);
2216 if (local->use_chanctx) {
2217 @@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct
2218 mutex_unlock(&local->chanctx_mtx);
2220 sdata->csa_chandef = csa_ie.chandef;
2221 + sdata->vif.csa_active = true;
2224 ieee80211_stop_queues_by_reason(&local->hw,
2225 --- a/net/mac80211/chan.c
2226 +++ b/net/mac80211/chan.c
2227 @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
2229 struct ieee80211_sub_if_data *sdata;
2231 + lockdep_assert_held(&local->mtx);
2234 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2235 if (sdata->radar_required) {
2236 --- a/net/mac80211/ibss.c
2237 +++ b/net/mac80211/ibss.c
2238 @@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
2241 mutex_lock(&local->mtx);
2242 - ieee80211_vif_release_channel(sdata);
2243 if (ieee80211_vif_use_channel(sdata, &chandef,
2244 ifibss->fixed_channel ?
2245 IEEE80211_CHANCTX_SHARED :
2246 @@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
2247 mutex_unlock(&local->mtx);
2250 + sdata->radar_required = radar_required;
2251 mutex_unlock(&local->mtx);
2253 memcpy(ifibss->bssid, bssid, ETH_ALEN);
2254 @@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
2255 rcu_assign_pointer(ifibss->presp, presp);
2256 mgmt = (void *)presp->head;
2258 - sdata->radar_required = radar_required;
2259 sdata->vif.bss_conf.enable_beacon = true;
2260 sdata->vif.bss_conf.beacon_int = beacon_int;
2261 sdata->vif.bss_conf.basic_rates = basic_rates;
2262 @@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
2263 presp->head_len, 0, GFP_KERNEL);
2264 cfg80211_put_bss(local->hw.wiphy, bss);
2265 netif_carrier_on(sdata->dev);
2266 - cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
2267 + cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
2270 static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
2271 @@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
2275 + sdata_assert_lock(sdata);
2277 sta_flags = IEEE80211_STA_DISABLE_VHT;
2278 switch (ifibss->chandef.width) {
2279 case NL80211_CHAN_WIDTH_5:
2280 @@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
2281 memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
2282 ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
2283 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
2285 + /* avoid excessive retries for probe request to wildcard SSIDs */
2287 + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
2289 ieee80211_tx_skb(sdata, skb);
2292 --- a/net/mac80211/mesh.c
2293 +++ b/net/mac80211/mesh.c
2294 @@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct
2295 if (!ifmsh->mesh_id)
2298 + sdata_assert_lock(sdata);
2300 sta_flags = IEEE80211_STA_DISABLE_VHT;
2301 switch (sdata->vif.bss_conf.chandef.width) {
2302 case NL80211_CHAN_WIDTH_20_NOHT:
2303 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2304 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2305 @@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
2306 struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
2307 struct net_device *ndev = ifp->ndev;
2308 struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
2309 + struct ieee80211_channel *chan;
2312 if (ifp->vif->mode == WL_MODE_AP) {
2313 @@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
2314 } else if (brcmf_is_linkup(e)) {
2315 brcmf_dbg(CONN, "Linkup\n");
2316 if (brcmf_is_ibssmode(ifp->vif)) {
2317 + chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
2318 memcpy(profile->bssid, e->addr, ETH_ALEN);
2319 wl_inform_ibss(cfg, ndev, e->addr);
2320 - cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
2321 + cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
2322 clear_bit(BRCMF_VIF_STATUS_CONNECTING,
2323 &ifp->vif->sme_state);
2324 set_bit(BRCMF_VIF_STATUS_CONNECTED,
2325 --- a/drivers/net/wireless/libertas/cfg.c
2326 +++ b/drivers/net/wireless/libertas/cfg.c
2327 @@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
2328 memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
2329 priv->wdev->ssid_len = params->ssid_len;
2331 - cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
2332 + cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
2335 /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
2336 priv->connect_status = LBS_CONNECTED;
2337 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2338 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2339 @@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy
2343 - cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
2344 + cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
2345 + params->chandef.chan, GFP_KERNEL);
2346 dev_dbg(priv->adapter->dev,
2347 "info: joined/created adhoc network with bssid"
2348 " %pM successfully\n", priv->cfg_bssid);
2349 --- a/drivers/net/wireless/rndis_wlan.c
2350 +++ b/drivers/net/wireless/rndis_wlan.c
2351 @@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
2352 bssid, req_ie, req_ie_len,
2353 resp_ie, resp_ie_len, GFP_KERNEL);
2354 } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
2355 - cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
2356 + cfg80211_ibss_joined(usbdev->net, bssid,
2357 + get_current_channel(usbdev, NULL),
2362 --- a/net/wireless/ibss.c
2363 +++ b/net/wireless/ibss.c
2365 #include "rdev-ops.h"
2368 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
2369 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2370 + struct ieee80211_channel *channel)
2372 struct wireless_dev *wdev = dev->ieee80211_ptr;
2373 struct cfg80211_bss *bss;
2374 @@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
2375 if (!wdev->ssid_len)
2378 - bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
2379 - wdev->ssid, wdev->ssid_len,
2380 + bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
2381 WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
2384 @@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
2388 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
2389 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2390 + struct ieee80211_channel *channel, gfp_t gfp)
2392 struct wireless_dev *wdev = dev->ieee80211_ptr;
2393 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
2394 struct cfg80211_event *ev;
2395 unsigned long flags;
2397 - trace_cfg80211_ibss_joined(dev, bssid);
2398 + trace_cfg80211_ibss_joined(dev, bssid, channel);
2400 + if (WARN_ON(!channel))
2403 ev = kzalloc(sizeof(*ev), gfp);
2407 ev->type = EVENT_IBSS_JOINED;
2408 - memcpy(ev->cr.bssid, bssid, ETH_ALEN);
2409 + memcpy(ev->ij.bssid, bssid, ETH_ALEN);
2410 + ev->ij.channel = channel;
2412 spin_lock_irqsave(&wdev->event_lock, flags);
2413 list_add_tail(&ev->list, &wdev->event_list);
2414 @@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
2416 wdev->ibss_fixed = params->channel_fixed;
2417 wdev->ibss_dfs_possible = params->userspace_handles_dfs;
2418 + wdev->chandef = params->chandef;
2419 #ifdef CPTCFG_CFG80211_WEXT
2420 wdev->wext.ibss.chandef = params->chandef;
2422 @@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
2424 wdev->current_bss = NULL;
2426 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2427 #ifdef CPTCFG_CFG80211_WEXT
2429 wdev->wext.ibss.ssid_len = 0;
2430 --- a/net/wireless/trace.h
2431 +++ b/net/wireless/trace.h
2432 @@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
2433 TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
2436 -DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
2437 - TP_PROTO(struct net_device *netdev, const u8 *addr),
2438 - TP_ARGS(netdev, addr)
2441 DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
2442 TP_PROTO(struct net_device *netdev, const u8 *addr),
2443 TP_ARGS(netdev, addr)
2444 @@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
2445 TP_ARGS(netdev, addr)
2448 +TRACE_EVENT(cfg80211_ibss_joined,
2449 + TP_PROTO(struct net_device *netdev, const u8 *bssid,
2450 + struct ieee80211_channel *channel),
2451 + TP_ARGS(netdev, bssid, channel),
2459 + MAC_ASSIGN(bssid, bssid);
2460 + CHAN_ASSIGN(channel);
2462 + TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
2463 + NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
2466 TRACE_EVENT(cfg80211_probe_status,
2467 TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
2469 --- a/net/wireless/util.c
2470 +++ b/net/wireless/util.c
2471 @@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
2472 ev->dc.reason, true);
2474 case EVENT_IBSS_JOINED:
2475 - __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
2476 + __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
2481 @@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct
2483 mutex_lock_nested(&wdev_iter->mtx, 1);
2484 __acquire(wdev_iter->mtx);
2485 - cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
2486 + cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
2487 wdev_unlock(wdev_iter);
2490 --- a/net/wireless/chan.c
2491 +++ b/net/wireless/chan.c
2492 @@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct
2494 cfg80211_get_chan_state(struct wireless_dev *wdev,
2495 struct ieee80211_channel **chan,
2496 - enum cfg80211_chan_mode *chanmode)
2497 + enum cfg80211_chan_mode *chanmode,
2501 *chanmode = CHAN_MODE_UNDEFINED;
2502 @@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
2503 !wdev->ibss_dfs_possible)
2505 : CHAN_MODE_EXCLUSIVE;
2507 + /* consider worst-case - IBSS can try to return to the
2508 + * original user-specified channel as creator */
2509 + if (wdev->ibss_dfs_possible)
2510 + *radar_detect |= BIT(wdev->chandef.width);
2514 @@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
2515 case NL80211_IFTYPE_AP:
2516 case NL80211_IFTYPE_P2P_GO:
2517 if (wdev->cac_started) {
2518 - *chan = wdev->channel;
2519 + *chan = wdev->chandef.chan;
2520 *chanmode = CHAN_MODE_SHARED;
2521 + *radar_detect |= BIT(wdev->chandef.width);
2522 } else if (wdev->beacon_interval) {
2523 - *chan = wdev->channel;
2524 + *chan = wdev->chandef.chan;
2525 *chanmode = CHAN_MODE_SHARED;
2527 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2529 + *radar_detect |= BIT(wdev->chandef.width);
2532 case NL80211_IFTYPE_MESH_POINT:
2533 if (wdev->mesh_id_len) {
2534 - *chan = wdev->channel;
2535 + *chan = wdev->chandef.chan;
2536 *chanmode = CHAN_MODE_SHARED;
2538 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2540 + *radar_detect |= BIT(wdev->chandef.width);
2543 case NL80211_IFTYPE_MONITOR:
2544 --- a/net/wireless/mesh.c
2545 +++ b/net/wireless/mesh.c
2546 @@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
2548 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
2549 wdev->mesh_id_len = setup->mesh_id_len;
2550 - wdev->channel = setup->chandef.chan;
2551 + wdev->chandef = setup->chandef;
2555 @@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
2556 err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
2559 - wdev->channel = chandef->chan;
2560 + wdev->chandef = *chandef;
2564 @@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct
2565 err = rdev_leave_mesh(rdev, dev);
2567 wdev->mesh_id_len = 0;
2568 - wdev->channel = NULL;
2569 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2570 rdev_set_qos_map(rdev, dev, NULL);
2573 --- a/net/wireless/mlme.c
2574 +++ b/net/wireless/mlme.c
2575 @@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
2576 if (WARN_ON(!wdev->cac_started))
2579 - if (WARN_ON(!wdev->channel))
2580 + if (WARN_ON(!wdev->chandef.chan))
2584 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2585 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2586 @@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
2591 + if (is2GHz && !twiceMaxEdgePower)
2592 + twiceMaxEdgePower = 60;
2594 return twiceMaxEdgePower;
2597 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2598 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2600 #define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
2601 #define MAX_MAG_DELTA 11
2602 #define MAX_PHS_DELTA 10
2606 - int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2607 - int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2608 + int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2609 + int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2613 @@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2617 - iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
2618 + iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
2620 ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
2621 chain_idx, iqc_coeff[0]);
2622 @@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2626 - iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
2627 + iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
2629 ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
2630 chain_idx, iqc_coeff[1]);
2631 @@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
2635 -static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
2636 +static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
2640 int mp_max = -64, max_idx = 0;
2641 @@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
2643 /* find min/max mismatch across all calibrated gains */
2644 for (i = 0; i < nmeasurement; i++) {
2645 - if (mp_coeff[i] > mp_max) {
2646 - mp_max = mp_coeff[i];
2647 + if (mp_coeff[i][0] > mp_max) {
2648 + mp_max = mp_coeff[i][0];
2650 - } else if (mp_coeff[i] < mp_min) {
2651 - mp_min = mp_coeff[i];
2652 + } else if (mp_coeff[i][0] < mp_min) {
2653 + mp_min = mp_coeff[i][0];
2658 /* find average (exclude max abs value) */
2659 for (i = 0; i < nmeasurement; i++) {
2660 - if ((abs(mp_coeff[i]) < abs(mp_max)) ||
2661 - (abs(mp_coeff[i]) < abs(mp_min))) {
2662 - mp_avg += mp_coeff[i];
2663 + if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
2664 + (abs(mp_coeff[i][0]) < abs(mp_min))) {
2665 + mp_avg += mp_coeff[i][0];
2669 @@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
2673 - mp_avg = mp_coeff[nmeasurement - 1];
2674 + mp_avg = mp_coeff[nmeasurement - 1][0];
2676 /* detect outlier */
2677 if (abs(mp_max - mp_min) > max_delta) {
2678 @@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
2680 outlier_idx = min_idx;
2682 - mp_coeff[outlier_idx] = mp_avg;
2683 + mp_coeff[outlier_idx][0] = mp_avg;
2687 -static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
2688 - struct coeff *coeff,
2690 +static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
2691 + struct coeff *coeff,
2694 int i, im, nmeasurement;
2695 + int magnitude, phase;
2696 u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
2697 struct ath9k_hw_cal_data *caldata = ah->caldata;
2699 @@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
2700 if (nmeasurement > MAX_MEASUREMENT)
2701 nmeasurement = MAX_MEASUREMENT;
2703 - /* detect outlier only if nmeasurement > 1 */
2704 - if (nmeasurement > 1) {
2705 - /* Detect magnitude outlier */
2706 - ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2707 - nmeasurement, MAX_MAG_DELTA);
2709 - /* Detect phase outlier */
2710 - ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2711 - nmeasurement, MAX_PHS_DELTA);
2713 + * Skip normal outlier detection for AR9550.
2715 + if (!AR_SREV_9550(ah)) {
2716 + /* detect outlier only if nmeasurement > 1 */
2717 + if (nmeasurement > 1) {
2718 + /* Detect magnitude outlier */
2719 + ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2723 + /* Detect phase outlier */
2724 + ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2730 for (im = 0; im < nmeasurement; im++) {
2731 + magnitude = coeff->mag_coeff[i][im][0];
2732 + phase = coeff->phs_coeff[i][im][0];
2734 - coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
2735 - ((coeff->phs_coeff[i][im] & 0x7f) << 7);
2736 + coeff->iqc_coeff[0] =
2737 + (phase & 0x7f) | ((magnitude & 0x7f) << 7);
2740 REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
2741 @@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
2745 -static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
2746 +static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
2747 + struct coeff *coeff,
2748 + int i, int nmeasurement)
2750 + struct ath_common *common = ath9k_hw_common(ah);
2751 + int im, ix, iy, temp;
2753 + for (im = 0; im < nmeasurement; im++) {
2754 + for (ix = 0; ix < MAXIQCAL - 1; ix++) {
2755 + for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
2756 + if (coeff->mag_coeff[i][im][iy] <
2757 + coeff->mag_coeff[i][im][ix]) {
2758 + temp = coeff->mag_coeff[i][im][ix];
2759 + coeff->mag_coeff[i][im][ix] =
2760 + coeff->mag_coeff[i][im][iy];
2761 + coeff->mag_coeff[i][im][iy] = temp;
2763 + if (coeff->phs_coeff[i][im][iy] <
2764 + coeff->phs_coeff[i][im][ix]) {
2765 + temp = coeff->phs_coeff[i][im][ix];
2766 + coeff->phs_coeff[i][im][ix] =
2767 + coeff->phs_coeff[i][im][iy];
2768 + coeff->phs_coeff[i][im][iy] = temp;
2772 + coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
2773 + coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
2775 + ath_dbg(common, CALIBRATE,
2776 + "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
2778 + coeff->mag_coeff[i][im][0],
2779 + coeff->phs_coeff[i][im][0]);
2783 +static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
2784 + struct coeff *coeff,
2790 + if ((iqcal_idx + 1) != MAXIQCAL)
2793 + for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2794 + __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
2800 +static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
2804 struct ath_common *common = ath9k_hw_common(ah);
2805 const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
2806 @@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
2807 AR_PHY_CHAN_INFO_TAB_1,
2808 AR_PHY_CHAN_INFO_TAB_2,
2810 - struct coeff coeff;
2811 + static struct coeff coeff;
2815 + int nmeasurement = 0;
2816 + bool outlier_detect = true;
2818 for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2819 if (!(ah->txchainmask & (1 << i)))
2820 @@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
2824 - coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
2825 - coeff.phs_coeff[i][im] =
2826 + coeff.phs_coeff[i][im][iqcal_idx] =
2827 + coeff.iqc_coeff[0] & 0x7f;
2828 + coeff.mag_coeff[i][im][iqcal_idx] =
2829 (coeff.iqc_coeff[0] >> 7) & 0x7f;
2831 - if (coeff.mag_coeff[i][im] > 63)
2832 - coeff.mag_coeff[i][im] -= 128;
2833 - if (coeff.phs_coeff[i][im] > 63)
2834 - coeff.phs_coeff[i][im] -= 128;
2835 + if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
2836 + coeff.mag_coeff[i][im][iqcal_idx] -= 128;
2837 + if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
2838 + coeff.phs_coeff[i][im][iqcal_idx] -= 128;
2841 - ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
2843 + if (AR_SREV_9550(ah))
2844 + outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
2845 + iqcal_idx, nmeasurement);
2846 + if (outlier_detect)
2847 + ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
2851 @@ -1409,7 +1484,7 @@ skip_tx_iqcal:
2855 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
2856 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
2857 else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
2858 ar9003_hw_tx_iq_cal_reload(ah);
2860 @@ -1455,14 +1530,38 @@ skip_tx_iqcal:
2864 +static bool do_ar9003_agc_cal(struct ath_hw *ah)
2866 + struct ath_common *common = ath9k_hw_common(ah);
2869 + REG_WRITE(ah, AR_PHY_AGC_CONTROL,
2870 + REG_READ(ah, AR_PHY_AGC_CONTROL) |
2871 + AR_PHY_AGC_CONTROL_CAL);
2873 + status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
2874 + AR_PHY_AGC_CONTROL_CAL,
2875 + 0, AH_WAIT_TIMEOUT);
2877 + ath_dbg(common, CALIBRATE,
2878 + "offset calibration failed to complete in %d ms,"
2879 + "noisy environment?\n",
2880 + AH_WAIT_TIMEOUT / 1000);
2887 static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
2888 struct ath9k_channel *chan)
2890 struct ath_common *common = ath9k_hw_common(ah);
2891 struct ath9k_hw_cal_data *caldata = ah->caldata;
2892 bool txiqcal_done = false;
2893 - bool is_reusable = true, status = true;
2894 + bool status = true;
2895 bool run_agc_cal = false, sep_iq_cal = false;
2898 /* Use chip chainmask only for calibration */
2899 ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
2900 @@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
2901 * AGC calibration. Specifically, AR9550 in SoC chips.
2903 if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
2904 - txiqcal_done = true;
2905 + if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
2906 + AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
2907 + txiqcal_done = true;
2909 + txiqcal_done = false;
2914 @@ -1512,27 +1616,37 @@ skip_tx_iqcal:
2915 if (AR_SREV_9330_11(ah))
2916 ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
2918 - /* Calibrate the AGC */
2919 - REG_WRITE(ah, AR_PHY_AGC_CONTROL,
2920 - REG_READ(ah, AR_PHY_AGC_CONTROL) |
2921 - AR_PHY_AGC_CONTROL_CAL);
2923 - /* Poll for offset calibration complete */
2924 - status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
2925 - AR_PHY_AGC_CONTROL_CAL,
2926 - 0, AH_WAIT_TIMEOUT);
2929 + * For non-AR9550 chips, we just trigger AGC calibration
2930 + * in the HW, poll for completion and then process
2933 + * For AR955x, we run it multiple times and use
2934 + * median IQ correction.
2936 + if (!AR_SREV_9550(ah)) {
2937 + status = do_ar9003_agc_cal(ah);
2942 - ath_dbg(common, CALIBRATE,
2943 - "offset calibration failed to complete in %d ms; noisy environment?\n",
2944 - AH_WAIT_TIMEOUT / 1000);
2947 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
2949 + if (!txiqcal_done) {
2950 + status = do_ar9003_agc_cal(ah);
2954 + for (i = 0; i < MAXIQCAL; i++) {
2955 + status = do_ar9003_agc_cal(ah);
2958 + ar9003_hw_tx_iq_cal_post_proc(ah, i, false);
2965 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
2967 /* Revert chainmask to runtime parameters */
2968 ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
2970 --- a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
2971 +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
2976 +#include <linux/cache.h>
2978 #include "rtl818x.h"
2981 @@ -139,7 +141,10 @@ struct rtl8187_priv {
2988 + u8 dummy1[L1_CACHE_BYTES];
2989 + } ____cacheline_aligned;
2990 struct sk_buff_head queue;
2991 } b_tx_status; /* This queue is used by both -b and non-b devices */
2992 struct mutex io_mutex;
2993 @@ -147,7 +152,8 @@ struct rtl8187_priv {
2998 + u8 dummy2[L1_CACHE_BYTES];
2999 + } *io_dmabuf ____cacheline_aligned;
3003 --- a/net/mac80211/wme.c
3004 +++ b/net/mac80211/wme.c
3005 @@ -154,6 +154,11 @@ u16 ieee80211_select_queue(struct ieee80
3006 return IEEE80211_AC_BE;
3009 + if (skb->protocol == sdata->control_port_protocol) {
3010 + skb->priority = 7;
3011 + return ieee80211_downgrade_queue(sdata, skb);
3014 /* use the data classifier to determine what 802.1d tag the
3017 --- a/drivers/net/wireless/ath/ath9k/xmit.c
3018 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3019 @@ -1444,14 +1444,16 @@ void ath_tx_aggr_sleep(struct ieee80211_
3020 for (tidno = 0, tid = &an->tid[tidno];
3021 tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
3029 ath_txq_lock(sc, txq);
3031 + if (!tid->sched) {
3032 + ath_txq_unlock(sc, txq);
3036 buffered = ath_tid_has_buffered(tid);
3039 @@ -2184,14 +2186,15 @@ int ath_tx_start(struct ieee80211_hw *hw
3040 txq->stopped = true;
3044 + tid = ath_get_skb_tid(sc, txctl->an, skb);
3046 if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
3047 ath_txq_unlock(sc, txq);
3048 txq = sc->tx.uapsdq;
3049 ath_txq_lock(sc, txq);
3050 } else if (txctl->an &&
3051 ieee80211_is_data_present(hdr->frame_control)) {
3052 - tid = ath_get_skb_tid(sc, txctl->an, skb);
3054 WARN_ON(tid->ac->txq != txctl->txq);
3056 if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
3057 --- a/drivers/net/wireless/ath/ath9k/init.c
3058 +++ b/drivers/net/wireless/ath/ath9k/init.c
3059 @@ -943,6 +943,7 @@ static void ath9k_set_hw_capab(struct at
3060 hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
3061 hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
3062 hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
3063 + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
3067 --- a/net/mac80211/ieee80211_i.h
3068 +++ b/net/mac80211/ieee80211_i.h
3069 @@ -1700,14 +1700,8 @@ void ieee80211_stop_queue_by_reason(stru
3070 void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);
3071 void ieee80211_add_pending_skb(struct ieee80211_local *local,
3072 struct sk_buff *skb);
3073 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3074 - struct sk_buff_head *skbs,
3075 - void (*fn)(void *data), void *data);
3076 -static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3077 - struct sk_buff_head *skbs)
3079 - ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
3081 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3082 + struct sk_buff_head *skbs);
3083 void ieee80211_flush_queues(struct ieee80211_local *local,
3084 struct ieee80211_sub_if_data *sdata);
3086 --- a/net/mac80211/sta_info.c
3087 +++ b/net/mac80211/sta_info.c
3088 @@ -91,7 +91,7 @@ static int sta_info_hash_del(struct ieee
3092 -static void cleanup_single_sta(struct sta_info *sta)
3093 +static void __cleanup_single_sta(struct sta_info *sta)
3096 struct tid_ampdu_tx *tid_tx;
3097 @@ -99,7 +99,8 @@ static void cleanup_single_sta(struct st
3098 struct ieee80211_local *local = sdata->local;
3101 - if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
3102 + if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
3103 + test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
3104 if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
3105 sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
3106 ps = &sdata->bss->ps;
3107 @@ -109,6 +110,7 @@ static void cleanup_single_sta(struct st
3110 clear_sta_flag(sta, WLAN_STA_PS_STA);
3111 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3113 atomic_dec(&ps->num_sta_ps);
3114 sta_info_recalc_tim(sta);
3115 @@ -139,7 +141,14 @@ static void cleanup_single_sta(struct st
3116 ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
3121 +static void cleanup_single_sta(struct sta_info *sta)
3123 + struct ieee80211_sub_if_data *sdata = sta->sdata;
3124 + struct ieee80211_local *local = sdata->local;
3126 + __cleanup_single_sta(sta);
3127 sta_info_free(local, sta);
3130 @@ -330,6 +339,7 @@ struct sta_info *sta_info_alloc(struct i
3133 spin_lock_init(&sta->lock);
3134 + spin_lock_init(&sta->ps_lock);
3135 INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
3136 INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
3137 mutex_init(&sta->ampdu_mlme.mtx);
3138 @@ -487,21 +497,26 @@ static int sta_info_insert_finish(struct
3142 - /* notify driver */
3143 - err = sta_info_insert_drv_state(local, sdata, sta);
3148 local->sta_generation++;
3151 + /* simplify things and don't accept BA sessions yet */
3152 + set_sta_flag(sta, WLAN_STA_BLOCK_BA);
3154 /* make the station visible */
3155 sta_info_hash_add(local, sta);
3157 list_add_rcu(&sta->list, &local->sta_list);
3159 + /* notify driver */
3160 + err = sta_info_insert_drv_state(local, sdata, sta);
3164 set_sta_flag(sta, WLAN_STA_INSERTED);
3165 + /* accept BA sessions now */
3166 + clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
3168 ieee80211_recalc_min_chandef(sdata);
3169 ieee80211_sta_debugfs_add(sta);
3170 @@ -522,6 +537,12 @@ static int sta_info_insert_finish(struct
3171 mesh_accept_plinks_update(sdata);
3175 + sta_info_hash_del(local, sta);
3176 + list_del_rcu(&sta->list);
3178 + synchronize_net();
3179 + __cleanup_single_sta(sta);
3181 mutex_unlock(&local->sta_mtx);
3183 @@ -1071,10 +1092,14 @@ struct ieee80211_sta *ieee80211_find_sta
3185 EXPORT_SYMBOL(ieee80211_find_sta);
3187 -static void clear_sta_ps_flags(void *_sta)
3188 +/* powersave support code */
3189 +void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3191 - struct sta_info *sta = _sta;
3192 struct ieee80211_sub_if_data *sdata = sta->sdata;
3193 + struct ieee80211_local *local = sdata->local;
3194 + struct sk_buff_head pending;
3195 + int filtered = 0, buffered = 0, ac;
3196 + unsigned long flags;
3199 if (sdata->vif.type == NL80211_IFTYPE_AP ||
3200 @@ -1085,20 +1110,6 @@ static void clear_sta_ps_flags(void *_st
3204 - clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3205 - if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
3206 - atomic_dec(&ps->num_sta_ps);
3209 -/* powersave support code */
3210 -void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3212 - struct ieee80211_sub_if_data *sdata = sta->sdata;
3213 - struct ieee80211_local *local = sdata->local;
3214 - struct sk_buff_head pending;
3215 - int filtered = 0, buffered = 0, ac;
3216 - unsigned long flags;
3218 clear_sta_flag(sta, WLAN_STA_SP);
3220 BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
3221 @@ -1109,6 +1120,8 @@ void ieee80211_sta_ps_deliver_wakeup(str
3223 skb_queue_head_init(&pending);
3225 + /* sync with ieee80211_tx_h_unicast_ps_buf */
3226 + spin_lock(&sta->ps_lock);
3227 /* Send all buffered frames to the station */
3228 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
3229 int count = skb_queue_len(&pending), tmp;
3230 @@ -1127,7 +1140,12 @@ void ieee80211_sta_ps_deliver_wakeup(str
3231 buffered += tmp - count;
3234 - ieee80211_add_pending_skbs_fn(local, &pending, clear_sta_ps_flags, sta);
3235 + ieee80211_add_pending_skbs(local, &pending);
3236 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3237 + clear_sta_flag(sta, WLAN_STA_PS_STA);
3238 + spin_unlock(&sta->ps_lock);
3240 + atomic_dec(&ps->num_sta_ps);
3242 /* This station just woke up and isn't aware of our SMPS state */
3243 if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,
3244 --- a/net/mac80211/sta_info.h
3245 +++ b/net/mac80211/sta_info.h
3246 @@ -267,6 +267,7 @@ struct ieee80211_tx_latency_stat {
3247 * @drv_unblock_wk: used for driver PS unblocking
3248 * @listen_interval: listen interval of this station, when we're acting as AP
3249 * @_flags: STA flags, see &enum ieee80211_sta_info_flags, do not use directly
3250 + * @ps_lock: used for powersave (when mac80211 is the AP) related locking
3251 * @ps_tx_buf: buffers (per AC) of frames to transmit to this station
3252 * when it leaves power saving state or polls
3253 * @tx_filtered: buffers (per AC) of frames we already tried to
3254 @@ -356,10 +357,8 @@ struct sta_info {
3255 /* use the accessors defined below */
3256 unsigned long _flags;
3259 - * STA powersave frame queues, no more than the internal
3260 - * locking required.
3262 + /* STA powersave lock and frame queues */
3263 + spinlock_t ps_lock;
3264 struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
3265 struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
3266 unsigned long driver_buffered_tids;
3267 --- a/net/mac80211/util.c
3268 +++ b/net/mac80211/util.c
3269 @@ -435,9 +435,8 @@ void ieee80211_add_pending_skb(struct ie
3270 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
3273 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3274 - struct sk_buff_head *skbs,
3275 - void (*fn)(void *data), void *data)
3276 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3277 + struct sk_buff_head *skbs)
3279 struct ieee80211_hw *hw = &local->hw;
3280 struct sk_buff *skb;
3281 @@ -461,9 +460,6 @@ void ieee80211_add_pending_skbs_fn(struc
3282 __skb_queue_tail(&local->pending[queue], skb);
3288 for (i = 0; i < hw->queues; i++)
3289 __ieee80211_wake_queue(hw, i,
3290 IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
3291 --- a/net/wireless/reg.c
3292 +++ b/net/wireless/reg.c
3293 @@ -1700,7 +1700,7 @@ static void reg_process_hint(struct regu
3295 case NL80211_REGDOM_SET_BY_USER:
3296 treatment = reg_process_hint_user(reg_request);
3297 - if (treatment == REG_REQ_OK ||
3298 + if (treatment == REG_REQ_IGNORE ||
3299 treatment == REG_REQ_ALREADY_SET)
3301 schedule_delayed_work(®_timeout, msecs_to_jiffies(3142));
3302 --- a/drivers/net/wireless/ath/ath9k/debug.c
3303 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3304 @@ -866,6 +866,12 @@ static ssize_t read_file_reset(struct fi
3305 "%17s: %2d\n", "PLL RX Hang",
3306 sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
3307 len += scnprintf(buf + len, sizeof(buf) - len,
3308 + "%17s: %2d\n", "MAC Hang",
3309 + sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
3310 + len += scnprintf(buf + len, sizeof(buf) - len,
3311 + "%17s: %2d\n", "Stuck Beacon",
3312 + sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
3313 + len += scnprintf(buf + len, sizeof(buf) - len,
3314 "%17s: %2d\n", "MCI Reset",
3315 sc->debug.stats.reset[RESET_TYPE_MCI]);
3317 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3318 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3319 @@ -868,10 +868,6 @@ static void ar9003_hw_set_rfmode(struct
3321 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
3322 rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
3323 - if (IS_CHAN_QUARTER_RATE(chan))
3324 - rfMode |= AR_PHY_MODE_QUARTER;
3325 - if (IS_CHAN_HALF_RATE(chan))
3326 - rfMode |= AR_PHY_MODE_HALF;
3328 if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
3329 REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,