1 commit 1abdeca3c6fb9cf1f84f85e78ed8d1c33bd69db0
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Fri Feb 28 18:52:56 2014 +0100
5 ath9k_hw: tweak noise immunity thresholds for older chipsets
7 Older chipsets are more sensitive to high PHY error counts, and the
8 current noise immunity thresholds were based on tests run at QCA with
11 This patch brings back the values from the old ANI implementation for
12 old chipsets, and it also disables weak signal detection on an earlier
13 noise immunity level, to improve overall radio stability on affected
16 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
18 commit 431e506da5953adc3b65af25f4b90873d528c115
19 Author: Felix Fietkau <nbd@openwrt.org>
20 Date: Fri Feb 28 18:44:13 2014 +0100
22 ath9k_hw: toggle weak signal detection in AP mode on older chipsets
24 The commit 80b4205b "ath9k: Fix OFDM weak signal detection for AP mode"
25 prevented weak signal detection changes from taking effect in AP mode on
26 all chipsets, claiming it is "not allowed".
28 The main reason for not disabling weak signal detection in AP mode is
29 that typically beacon RSSI is used to track whether it is needed to
30 boost range, and this is unavailable in AP mode for obvious reasons.
32 The problem with not disabling weak signal detection is that older
33 chipsets are very sensitive to high PHY error counts. When faced with
34 heavy noise, this can lead to an excessive amount of "Failed to stop
35 TX DMA" errors in the field.
37 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
39 commit 98d1a6c5b14688ed030e81b889f607be308e0df9
40 Author: Felix Fietkau <nbd@openwrt.org>
41 Date: Mon Feb 24 22:20:32 2014 +0100
43 ath9k: fix invalid descriptor discarding
45 Only set sc->rx.discard_next to rx_stats->rs_more when actually
46 discarding the current descriptor.
48 Also, fix a detection of broken descriptors:
49 First the code checks if the current descriptor is not done.
50 Then it checks if the next descriptor is done.
51 Add a check that afterwards checks the first descriptor again, because
52 it might have been completed in the mean time.
54 This fixes a regression introduced in
55 commit 723e711356b5a8a95728a890e254e8b0d47b55cf
56 "ath9k: fix handling of broken descriptors"
58 Cc: stable@vger.kernel.org
59 Reported-by: Marco André Dinis <marcoandredinis@gmail.com>
60 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
62 commit 52a46300e782fe6994466523eb2b0b59091ea59f
63 Author: Felix Fietkau <nbd@openwrt.org>
64 Date: Mon Feb 24 11:43:50 2014 +0100
66 ath9k: reduce baseband hang detection false positive rate
68 Check if the baseband state remains stable, and add a small delay
69 between register reads.
71 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
73 commit 118945bb12082e9d4edddc868d88143164e0f440
74 Author: Felix Fietkau <nbd@openwrt.org>
75 Date: Sat Feb 22 14:55:23 2014 +0100
77 ath5k: set SURVEY_INFO_IN_USE on get_survey
79 Only one channel is returned - the one currently being used.
81 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
83 commit ee41f72476e1ea44283dfe1cbf75b9543a1e15c8
84 Author: Felix Fietkau <nbd@openwrt.org>
85 Date: Sat Feb 22 14:44:52 2014 +0100
87 ath9k: make some hardware reset log messages debug-only
89 On some chips, baseband watchdog hangs are more common than others, and
90 the driver has support for handling them.
91 Interrupts even after a watchdog hang are also quite common, so there's
92 not much point in spamming the user's logfiles.
94 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
96 commit b14fbb554fc65a2e0b5c41a319269b0350f187e7
97 Author: Felix Fietkau <nbd@openwrt.org>
98 Date: Sat Feb 22 14:35:25 2014 +0100
100 ath9k: do not set half/quarter channel flags in AR_PHY_MODE
102 5/10 MHz channel bandwidth is configured via the PLL clock, instead of
103 the AR_PHY_MODE register. Using that register is AR93xx specific, and
104 makes the mode incompatible with earlier chipsets.
106 In some early versions, these flags were apparently applied at the wrong
107 point in time and thus did not cause connectivity issues, however now
108 they are causing problems, as pointed out in this OpenWrt ticket:
110 https://dev.openwrt.org/ticket/14916
112 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
114 commit 0f1cb7be2551b30b02cd54c897e0e29e483cfda5
115 Author: Felix Fietkau <nbd@openwrt.org>
116 Date: Sat Feb 22 13:43:29 2014 +0100
118 ath9k: fix ps-poll responses under a-mpdu sessions
120 When passing tx frames to the U-APSD queue for powersave poll responses,
121 the ath_atx_tid pointer needs to be passed to ath_tx_setup_buffer for
122 proper sequence number accounting.
124 This fixes high latency and connection stability issues with ath9k
125 running as AP and a few kinds of mobile phones as client, when PS-Poll
128 Cc: stable@vger.kernel.org
129 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
131 commit d5d87a37bbd6066b2c3c5d0bd0fe2a6e2ea45cc5
132 Author: Felix Fietkau <nbd@openwrt.org>
133 Date: Fri Feb 21 11:39:59 2014 +0100
135 ath9k: list more reset causes in debugfs
137 Number of MAC hangs and stuck beacons were missing
139 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
141 commit d84856012e0f10fe598a5ad3b7b869397a089e07
142 Author: Johannes Berg <johannes.berg@intel.com>
143 Date: Thu Feb 20 11:19:58 2014 +0100
145 mac80211: fix station wakeup powersave race
147 Consider the following (relatively unlikely) scenario:
148 1) station goes to sleep while frames are buffered in driver
149 2) driver blocks wakeup (until no more frames are buffered)
150 3) station wakes up again
151 4) driver unblocks wakeup
153 In this case, the current mac80211 code will do the following:
154 1) WLAN_STA_PS_STA set
155 2) WLAN_STA_PS_DRIVER set
157 4) WLAN_STA_PS_DRIVER cleared
159 As a result, no frames will be delivered to the client, even
160 though it is awake, until it sends another frame to us that
161 triggers ieee80211_sta_ps_deliver_wakeup() in sta_ps_end().
163 Since we now take the PS spinlock, we can fix this while at
164 the same time removing the complexity with the pending skb
165 queue function. This was broken since my commit 50a9432daeec
166 ("mac80211: fix powersaving clients races") due to removing
167 the clearing of WLAN_STA_PS_STA in the RX path.
169 While at it, fix a cleanup path issue when a station is
170 removed while the driver is still blocking its wakeup.
172 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
174 commit 798f2786602cbe93e6b928299614aa36ebf50692
175 Author: Johannes Berg <johannes.berg@intel.com>
176 Date: Mon Feb 17 20:49:03 2014 +0100
178 mac80211: insert stations before adding to driver
180 There's a race condition in mac80211 because we add stations
181 to the internal lists after adding them to the driver, which
182 means that (for example) the following can happen:
183 1. a station connects and is added
184 2. first, it is added to the driver
185 3. then, it is added to the mac80211 lists
187 If the station goes to sleep between steps 2 and 3, and the
188 firmware/hardware records it as being asleep, mac80211 will
189 never instruct the driver to wake it up again as it never
190 realized it went to sleep since the RX path discarded the
191 frame as a "spurious class 3 frame", no station entry was
194 Fix this by adding the station in software first, and only
195 then adding it to the driver. That way, any state that the
196 driver changes will be reflected properly in mac80211's
197 station state. The problematic part is the roll-back if the
198 driver fails to add the station, in that case a bit more is
199 needed. To not make that overly complex prevent starting BA
200 sessions in the meantime.
202 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
204 commit b9ba6a520cb07ab3aa7aaaf9ce4a0bc7a6bc06fe
205 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
206 Date: Thu Feb 20 09:22:11 2014 +0200
208 mac80211: fix AP powersave TX vs. wakeup race
210 There is a race between the TX path and the STA wakeup: while
211 a station is sleeping, mac80211 buffers frames until it wakes
212 up, then the frames are transmitted. However, the RX and TX
213 path are concurrent, so the packet indicating wakeup can be
214 processed while a packet is being transmitted.
216 This can lead to a situation where the buffered frames list
217 is emptied on the one side, while a frame is being added on
218 the other side, as the station is still seen as sleeping in
221 As a result, the newly added frame will not be send anytime
222 soon. It might be sent much later (and out of order) when the
223 station goes to sleep and wakes up the next time.
225 Additionally, it can lead to the crash below.
227 Fix all this by synchronising both paths with a new lock.
228 Both path are not fastpath since they handle PS situations.
230 In a later patch we'll remove the extra skb queue locks to
231 reduce locking overhead.
233 BUG: unable to handle kernel
234 NULL pointer dereference at 000000b0
235 IP: [<ff6f1791>] ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
237 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
238 EIP: 0060:[<ff6f1791>] EFLAGS: 00210282 CPU: 1
239 EIP is at ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
240 EAX: e5900da0 EBX: 00000000 ECX: 00000001 EDX: 00000000
241 ESI: e41d00c0 EDI: e5900da0 EBP: ebe458e4 ESP: ebe458b0
242 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
243 CR0: 8005003b CR2: 000000b0 CR3: 25a78000 CR4: 000407d0
244 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
245 DR6: ffff0ff0 DR7: 00000400
246 Process iperf (pid: 3934, ti=ebe44000 task=e757c0b0 task.ti=ebe44000)
247 iwlwifi 0000:02:00.0: I iwl_pcie_enqueue_hcmd Sending command LQ_CMD (#4e), seq: 0x0903, 92 bytes at 3[3]:9
249 e403b32c ebe458c4 00200002 00200286 e403b338 ebe458cc c10960bb e5900da0
250 ff76a6ec ebe458d8 00000000 e41d00c0 e5900da0 ebe458f0 ff6f1b75 e403b210
251 ebe4598c ff723dc1 00000000 ff76a6ec e597c978 e403b758 00000002 00000002
253 [<ff6f1b75>] ieee80211_free_txskb+0x15/0x20 [mac80211]
254 [<ff723dc1>] invoke_tx_handlers+0x1661/0x1780 [mac80211]
255 [<ff7248a5>] ieee80211_tx+0x75/0x100 [mac80211]
256 [<ff7249bf>] ieee80211_xmit+0x8f/0xc0 [mac80211]
257 [<ff72550e>] ieee80211_subif_start_xmit+0x4fe/0xe20 [mac80211]
258 [<c149ef70>] dev_hard_start_xmit+0x450/0x950
259 [<c14b9aa9>] sch_direct_xmit+0xa9/0x250
260 [<c14b9c9b>] __qdisc_run+0x4b/0x150
261 [<c149f732>] dev_queue_xmit+0x2c2/0xca0
263 Cc: stable@vger.kernel.org
264 Reported-by: Yaara Rozenblum <yaara.rozenblum@intel.com>
265 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
266 Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
267 [reword commit log, use a separate lock]
268 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
270 commit 80e419de0dff38436b30d363311c625766193f86
271 Author: Inbal Hacohen <Inbal.Hacohen@intel.com>
272 Date: Wed Feb 12 09:32:27 2014 +0200
274 cfg80211: bugfix in regulatory user hint process
276 After processing hint_user, we would want to schedule the
277 timeout work only if we are actually waiting to CRDA. This happens
278 when the status is not "IGNORE" nor "ALREADY_SET".
280 Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
281 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
283 commit 6514c93afede55284e2cb63359aadedb85884c80
284 Author: Jouni Malinen <jouni@qca.qualcomm.com>
285 Date: Tue Feb 18 20:41:08 2014 +0200
287 ath9k: Enable U-APSD AP mode support
289 mac80211 handles the actual operations, so ath9k can just indicate
290 support for this. Based on initial tests, this combination seems to
293 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
295 commit a63caf0a357ad5c1f08d6b7827dc76c451445017
296 Author: Stanislaw Gruszka <sgruszka@redhat.com>
297 Date: Wed Feb 19 13:15:17 2014 +0100
299 ath9k: protect tid->sched check
301 We check tid->sched without a lock taken on ath_tx_aggr_sleep(). That
302 is race condition which can result of doing list_del(&tid->list) twice
303 (second time with poisoned list node) and cause crash like shown below:
305 [424271.637220] BUG: unable to handle kernel paging request at 00100104
306 [424271.637328] IP: [<f90fc072>] ath_tx_aggr_sleep+0x62/0xe0 [ath9k]
308 [424271.639953] Call Trace:
309 [424271.639998] [<f90f6900>] ? ath9k_get_survey+0x110/0x110 [ath9k]
310 [424271.640083] [<f90f6942>] ath9k_sta_notify+0x42/0x50 [ath9k]
311 [424271.640177] [<f809cfef>] sta_ps_start+0x8f/0x1c0 [mac80211]
312 [424271.640258] [<c10f730e>] ? free_compound_page+0x2e/0x40
313 [424271.640346] [<f809e915>] ieee80211_rx_handlers+0x9d5/0x2340 [mac80211]
314 [424271.640437] [<c112f048>] ? kmem_cache_free+0x1d8/0x1f0
315 [424271.640510] [<c1345a84>] ? kfree_skbmem+0x34/0x90
316 [424271.640578] [<c10fc23c>] ? put_page+0x2c/0x40
317 [424271.640640] [<c1345a84>] ? kfree_skbmem+0x34/0x90
318 [424271.640706] [<c1345a84>] ? kfree_skbmem+0x34/0x90
319 [424271.640787] [<f809dde3>] ? ieee80211_rx_handlers_result+0x73/0x1d0 [mac80211]
320 [424271.640897] [<f80a07a0>] ieee80211_prepare_and_rx_handle+0x520/0xad0 [mac80211]
321 [424271.641009] [<f809e22d>] ? ieee80211_rx_handlers+0x2ed/0x2340 [mac80211]
322 [424271.641104] [<c13846ce>] ? ip_output+0x7e/0xd0
323 [424271.641182] [<f80a1057>] ieee80211_rx+0x307/0x7c0 [mac80211]
324 [424271.641266] [<f90fa6ee>] ath_rx_tasklet+0x88e/0xf70 [ath9k]
325 [424271.641358] [<f80a0f2c>] ? ieee80211_rx+0x1dc/0x7c0 [mac80211]
326 [424271.641445] [<f90f82db>] ath9k_tasklet+0xcb/0x130 [ath9k]
329 https://bugzilla.kernel.org/show_bug.cgi?id=70551
331 Reported-and-tested-by: Max Sydorenko <maxim.stargazer@gmail.com>
332 Cc: stable@vger.kernel.org
333 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
335 commit 82ed9e3ccc02797df2ffe4b78127c4cd5f799a41
336 Author: Felix Fietkau <nbd@openwrt.org>
337 Date: Tue Feb 11 15:54:13 2014 +0100
339 mac80211: send control port protocol frames to the VO queue
341 Improves reliability of wifi connections with WPA, since authentication
342 frames are prioritized over normal traffic and also typically exempt
345 Cc: stable@vger.kernel.org
346 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
348 commit d4426800f71e972feaa33e04c5801fc730627bdd
349 Author: Stanislaw Gruszka <stf_xl@wp.pl>
350 Date: Mon Feb 10 22:38:28 2014 +0100
352 rtl8187: fix regression on MIPS without coherent DMA
354 This patch fixes regression caused by commit a16dad77634 "MIPS: Fix
355 potencial corruption". That commit fixes one corruption scenario in
356 cost of adding another one, which actually start to cause crashes
357 on Yeeloong laptop when rtl8187 driver is used.
359 For correct DMA read operation on machines without DMA coherence, kernel
360 have to invalidate cache, such it will refill later with new data that
361 device wrote to memory, when that data is needed to process. We can only
362 invalidate full cache line. Hence when cache line includes both dma
363 buffer and some other data (written in cache, but not yet in main
364 memory), the other data can not hit memory due to invalidation. That
365 happen on rtl8187 where struct rtl8187_priv fields are located just
366 before and after small buffers that are passed to USB layer and DMA
367 is performed on them.
369 To fix the problem we align buffers and reserve space after them to make
370 them match cache line.
372 This patch does not resolve all possible MIPS problems entirely, for
373 that we have to assure that we always map cache aligned buffers for DMA,
374 what can be complex or even not possible. But patch fixes visible and
375 reproducible regression and seems other possible corruptions do not
376 happen in practice, since Yeeloong laptop works stable without rtl8187
380 https://bugzilla.kernel.org/show_bug.cgi?id=54391
382 Reported-by: Petr Pisar <petr.pisar@atlas.cz>
383 Bisected-by: Tom Li <biergaizi2009@gmail.com>
384 Reported-and-tested-by: Tom Li <biergaizi2009@gmail.com>
385 Cc: stable@vger.kernel.org
386 Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
388 commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
389 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
390 Date: Fri Feb 7 10:29:55 2014 +0530
392 ath9k: Calculate IQ-CAL median
394 This patch adds a routine to calculate the median IQ correction
395 values for AR955x, which is used for outlier detection.
396 The normal method which is used for all other chips is
399 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
401 commit c52a6fce0820c8d0687443ab86058ae03b478c8f
402 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
403 Date: Fri Feb 7 10:29:54 2014 +0530
405 ath9k: Expand the IQ coefficient array
407 This will be used for storing data for mutiple
408 IQ calibration runs, for AR955x.
410 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
412 commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
413 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
414 Date: Fri Feb 7 10:29:53 2014 +0530
416 ath9k: Modify IQ calibration for AR955x
418 IQ calibration post-processing for AR955x is different
419 from other chips - instead of just doing it as part
420 of AGC calibration once, it is triggered 3 times and
421 a median is determined. This patch adds initial support
422 for changing the calibration behavior for AR955x.
424 Also, to simplify things, a helper routine to issue/poll
425 AGC calibration is used.
427 For non-AR955x chips, the iqcal_idx (which will be used
428 in subsequent patches) is set to zero.
430 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
432 commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
433 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
434 Date: Fri Feb 7 10:29:52 2014 +0530
436 ath9k: Fix magnitude/phase calculation
438 Incorrect values are programmed in the registers
439 containing the IQ correction coefficients by the IQ-CAL
440 post-processing code. Fix this.
442 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
444 commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
445 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
446 Date: Fri Feb 7 10:29:51 2014 +0530
448 ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
450 Use ar9003_hw_tx_iq_cal_outlier_detection instead.
452 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
454 commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
455 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
456 Date: Fri Feb 7 10:29:50 2014 +0530
458 ath9k: Check explicitly for IQ calibration
460 In chips like AR955x, the initvals contain the information
461 whether IQ calibration is to be done in the HW when an
462 AGC calibration is triggered. Check if IQ-CAL is enabled
463 in the initvals before flagging 'txiqcal_done' as true.
465 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
467 commit cb4969634b93c4643a32cc3fbd27d2b288b25771
468 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
469 Date: Fri Feb 7 10:29:49 2014 +0530
471 ath9k: Fix IQ cal post processing for SoC
473 Calibration data is not reused for SoC chips, so
474 call ar9003_hw_tx_iq_cal_post_proc() with the correct
475 argument. The 'is_reusable' flag is currently used
476 only for PC-OEM chips, but it makes things clearer to
477 specify it explicity.
479 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
481 commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
482 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
483 Date: Mon Feb 3 13:31:37 2014 +0530
485 ath9k: Fix TX power calculation
487 The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
488 fixed the incorrect values in the eeprom templates, but if
489 boards have already been calibrated with incorrect values,
490 they would still be using the wrong TX power. Fix this by assigning
491 a default value in such cases.
493 Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
494 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
496 commit b9f268b5b01331c3c82179abca551429450e9417
497 Author: Michal Kazior <michal.kazior@tieto.com>
498 Date: Wed Jan 29 14:22:27 2014 +0100
500 cfg80211: consider existing DFS interfaces
502 It was possible to break interface combinations in
505 combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
506 combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
508 With the above interface combinations it was
511 step 1. start AP on DFS channel by matching combo 2
512 step 2. start AP on non-DFS channel by matching combo 1
514 This was possible beacuse (step 2) did not consider
515 if other interfaces require radar detection.
517 The patch changes how cfg80211 tracks channels -
518 instead of channel itself now a complete chandef
521 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
522 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
524 commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
525 Author: Antonio Quartulli <antonio@open-mesh.com>
526 Date: Wed Jan 29 17:53:43 2014 +0100
528 cfg80211: fix channel configuration in IBSS join
530 When receiving an IBSS_JOINED event select the BSS object
531 based on the {bssid, channel} couple rather than the bssid
533 With the current approach if another cell having the same
534 BSSID (but using a different channel) exists then cfg80211
535 picks up the wrong BSS object.
536 The result is a mismatching channel configuration between
537 cfg80211 and the driver, that can lead to any sort of
540 The issue can be triggered by having an IBSS sitting on
541 given channel and then asking the driver to create a new
542 cell using the same BSSID but with a different frequency.
543 By passing the channel to cfg80211_get_bss() we can solve
544 this ambiguity and retrieve/create the correct BSS object.
545 All the users of cfg80211_ibss_joined() have been changed
548 Moreover WARN when cfg80211_ibss_joined() gets a NULL
549 channel as argument and remove a bogus call of the same
550 function in ath6kl (it does not make sense to call
551 cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
553 Cc: Kalle Valo <kvalo@qca.qualcomm.com>
554 Cc: Arend van Spriel <arend@broadcom.com>
555 Cc: Bing Zhao <bzhao@marvell.com>
556 Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
557 Cc: libertas-dev@lists.infradead.org
558 Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
559 Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
560 [minor code cleanup in ath6kl]
561 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
563 commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
564 Author: Johannes Berg <johannes.berg@intel.com>
565 Date: Fri Jan 24 14:41:44 2014 +0100
567 mac80211: fix bufferable MMPDU RX handling
569 Action, disassoc and deauth frames are bufferable, and as such don't
570 have the PM bit in the frame control field reserved which means we
571 need to react to the bit when receiving in such a frame.
573 Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
574 and using it for the RX path that currently ignores the PM bit in
575 any non-data frames for doze->wake transitions, but listens to it in
576 all frames for wake->doze transitions, both of which are wrong.
578 Also use the new helper in the TX path to clean up the code.
580 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
582 commit fc0df6d2343636e3f48a069330d5b972e3d8659d
583 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
584 Date: Fri Jan 24 14:29:21 2014 +0100
586 cfg80211: set preset_chandef after channel switch
588 Set preset_chandef in channel switch notification.
589 In other case we will have old preset_chandef.
591 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
592 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
594 commit cdec895e2344987ff171cece96e25d7407a3ebf6
595 Author: Simon Wunderlich <simon@open-mesh.com>
596 Date: Fri Jan 24 23:48:29 2014 +0100
598 mac80211: send ibss probe responses with noack flag
600 Responding to probe requests for scanning clients will often create
601 excessive retries, as it happens quite often that the scanning client
602 already left the channel. Therefore do it like hostapd and send probe
603 responses for wildcard SSID only once by using the noack flag.
605 Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
606 [fix typo & 'wildcard SSID' in commit log]
607 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
609 commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
610 Author: Luciano Coelho <luciano.coelho@intel.com>
611 Date: Tue Jan 28 17:09:08 2014 +0200
613 mac80211: ibss: remove unnecessary call to release channel
615 The ieee80211_vif_use_channel() function calls
616 ieee80211_vif_release_channel(), so there's no need to call it
617 explicitly in __ieee80211_sta_join_ibss().
619 Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
620 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
622 commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
623 Author: Michal Kazior <michal.kazior@tieto.com>
624 Date: Wed Jan 29 07:56:21 2014 +0100
626 mac80211: add missing CSA locking
628 The patch adds a missing sdata lock and adds a few
629 lockdeps for easier maintenance.
631 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
632 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
634 commit ad17ba7d14d225b109b73c177cd446afb8050598
635 Author: Michal Kazior <michal.kazior@tieto.com>
636 Date: Wed Jan 29 07:56:20 2014 +0100
638 mac80211: fix sdata->radar_required locking
640 radar_required setting wasn't protected by
641 local->mtx in some places. This should prevent
642 from scanning/radar detection/roc colliding.
644 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
645 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
647 commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
648 Author: Michal Kazior <michal.kazior@tieto.com>
649 Date: Wed Jan 29 07:56:19 2014 +0100
651 mac80211: move csa_active setting in STA CSA
653 The sdata->vif.csa_active could be left set after,
654 e.g. channel context constraints check fail in STA
655 mode leaving the interface in a strange state for
656 a brief period of time until it is disconnected.
657 This was harmless but ugly.
659 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
660 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
661 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
663 commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
664 Author: Michal Kazior <michal.kazior@tieto.com>
665 Date: Wed Jan 29 07:56:18 2014 +0100
667 mac80211: fix possible memory leak on AP CSA failure
669 If CSA for AP interface failed and the interface
670 was not stopped afterwards another CSA request
671 would leak sdata->u.ap.next_beacon.
673 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
674 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
675 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
677 commit 3a77ba08940682bf3d52cf14f980337324af9d4a
678 Author: Johannes Berg <johannes.berg@intel.com>
679 Date: Sat Feb 1 00:33:29 2014 +0100
681 mac80211: fix fragmentation code, particularly for encryption
683 The "new" fragmentation code (since my rewrite almost 5 years ago)
684 erroneously sets skb->len rather than using skb_trim() to adjust
685 the length of the first fragment after copying out all the others.
686 This leaves the skb tail pointer pointing to after where the data
687 originally ended, and thus causes the encryption MIC to be written
688 at that point, rather than where it belongs: immediately after the
691 The impact of this is that if software encryption is done, then
692 a) encryption doesn't work for the first fragment, the connection
693 becomes unusable as the first fragment will never be properly
694 verified at the receiver, the MIC is practically guaranteed to
696 b) we leak up to 8 bytes of plaintext (!) of the packet out into
699 This is only mitigated by the fact that many devices are capable
700 of doing encryption in hardware, in which case this can't happen
701 as the tail pointer is irrelevant in that case. Additionally,
702 fragmentation is not used very frequently and would normally have
703 to be configured manually.
705 Fix this by using skb_trim() properly.
707 Cc: stable@vger.kernel.org
708 Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
709 Reported-by: Jouni Malinen <j@w1.fi>
710 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
712 commit de5f242e0c10e841017e37eb8c38974a642dbca8
713 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
714 Date: Tue Jan 28 06:21:59 2014 +0530
716 ath9k: Fix build error on ARM
718 Use mdelay instead of udelay to fix this error:
720 ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
721 make[1]: *** [__modpost] Error 1
722 make: *** [modules] Error 2
724 Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
725 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
727 commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
728 Author: Geert Uytterhoeven <geert@linux-m68k.org>
729 Date: Sun Jan 26 11:53:21 2014 +0100
731 ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
733 drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
734 drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
736 Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
737 optimize ath9k_flush").
739 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
741 commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
742 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
743 Date: Mon Jan 27 11:07:42 2014 +0200
745 mac80211: release the channel in error path in start_ap
747 When the driver cannot start the AP or when the assignement
748 of the beacon goes wrong, we need to unassign the vif.
750 Cc: stable@vger.kernel.org
751 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
752 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
754 commit dfb6889a75c601aedb7450b7e606668e77da6679
755 Author: Johannes Berg <johannes.berg@intel.com>
756 Date: Wed Jan 22 11:14:19 2014 +0200
758 cfg80211: send scan results from work queue
760 Due to the previous commit, when a scan finishes, it is in theory
761 possible to hit the following sequence:
762 1. interface starts being removed
763 2. scan is cancelled by driver and cfg80211 is notified
764 3. scan done work is scheduled
765 4. interface is removed completely, rdev->scan_req is freed,
766 event sent to userspace but scan done work remains pending
767 5. new scan is requested on another virtual interface
768 6. scan done work runs, freeing the still-running scan
770 To fix this situation, hang on to the scan done message and block
771 new scans while that is the case, and only send the message from
772 the work function, regardless of whether the scan_req is already
773 freed from interface removal. This makes step 5 above impossible
774 and changes step 6 to be
775 5. scan done work runs, sending the scan done message
777 As this can't work for wext, so we send the message immediately,
778 but this shouldn't be an issue since we still return -EBUSY.
780 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
782 commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
783 Author: Johannes Berg <johannes.berg@intel.com>
784 Date: Wed Jan 22 11:14:18 2014 +0200
786 cfg80211: fix scan done race
788 When an interface/wdev is removed, any ongoing scan should be
789 cancelled by the driver. This will make it call cfg80211, which
790 only queues a work struct. If interface/wdev removal is quick
791 enough, this can leave the scan request pending and processed
792 only after the interface is gone, causing a use-after-free.
794 Fix this by making sure the scan request is not pending after
795 the interface is destroyed. We can't flush or cancel the work
796 item due to locking concerns, but when it'll run it shouldn't
797 find anything to do. This leaves a potential issue, if a new
798 scan gets requested before the work runs, it prematurely stops
799 the running scan, potentially causing another crash. I'll fix
800 that in the next patch.
802 This was particularly observed with P2P_DEVICE wdevs, likely
803 because freeing them is quicker than freeing netdevs.
805 Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
806 Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
807 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
809 commit ae04fa489ab31b5a10d3cc8399f52761175d4321
810 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
811 Date: Thu Jan 23 14:28:16 2014 +0200
813 mac80211: avoid deadlock revealed by lockdep
815 sdata->u.ap.request_smps_work can’t be flushed synchronously
816 under wdev_lock(wdev) since ieee80211_request_smps_ap_work
817 itself locks the same lock.
818 While at it, reset the driver_smps_mode when the ap is
819 stopped to its default: OFF.
823 ======================================================
824 [ INFO: possible circular locking dependency detected ]
825 3.12.0-ipeer+ #2 Tainted: G O
826 -------------------------------------------------------
827 rmmod/2867 is trying to acquire lock:
828 ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
830 but task is already holding lock:
831 (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
833 which lock already depends on the new lock.
835 the existing dependency chain (in reverse order) is:
837 -> #1 (&wdev->mtx){+.+.+.}:
838 [<c10aefa9>] lock_acquire+0x79/0xe0
839 [<c1607a1a>] mutex_lock_nested+0x4a/0x360
840 [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
841 [<c105cdd8>] process_one_work+0x198/0x450
842 [<c105d469>] worker_thread+0xf9/0x320
843 [<c10669ff>] kthread+0x9f/0xb0
844 [<c1613397>] ret_from_kernel_thread+0x1b/0x28
846 -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
847 [<c10ae9df>] __lock_acquire+0x183f/0x1910
848 [<c10aefa9>] lock_acquire+0x79/0xe0
849 [<c105b917>] flush_work+0x47/0x90
850 [<c105d867>] __cancel_work_timer+0x67/0xe0
851 [<c105d90f>] cancel_work_sync+0xf/0x20
852 [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
853 [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
854 [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
855 [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
856 [<c160f2c9>] notifier_call_chain+0x59/0x130
857 [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
858 [<c106c70f>] raw_notifier_call_chain+0x1f/0x30
859 [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
860 [<c14f8263>] call_netdevice_notifiers+0x13/0x20
861 [<c14f82a4>] __dev_close_many+0x34/0xb0
862 [<c14f83fe>] dev_close_many+0x6e/0xc0
863 [<c14f9c77>] rollback_registered_many+0xa7/0x1f0
864 [<c14f9dd4>] unregister_netdevice_many+0x14/0x60
865 [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
866 [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
867 [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
868 [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
869 [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
870 [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
871 [<c10b8bf9>] SyS_delete_module+0x179/0x2b0
872 [<c1613421>] sysenter_do_call+0x12/0x32
874 Fixes: 687da132234f ("mac80211: implement SMPS for AP")
875 Cc: <stable@vger.kernel.org> [3.13]
876 Reported-by: Ilan Peer <ilan.peer@intel.com>
877 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
878 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
880 commit 178b205e96217164fd7c30113464250d0b6f5eca
881 Author: Johannes Berg <johannes.berg@intel.com>
882 Date: Thu Jan 23 16:32:29 2014 +0100
884 cfg80211: re-enable 5/10 MHz support
886 Unfortunately I forgot this during the merge window, but the
887 patch seems small enough to go in as a fix. The userspace API
888 bug that was the reason for disabling it has long been fixed.
890 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
892 commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
893 Author: Pontus Fuchs <pontus.fuchs@gmail.com>
894 Date: Thu Jan 16 15:00:40 2014 +0100
896 nl80211: Reset split_start when netlink skb is exhausted
898 When the netlink skb is exhausted split_start is left set. In the
899 subsequent retry, with a larger buffer, the dump is continued from the
900 failing point instead of from the beginning.
902 This was causing my rt28xx based USB dongle to now show up when
903 running "iw list" with an old iw version without split dump support.
905 Cc: stable@vger.kernel.org
906 Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
907 Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
908 [avoid the entire workaround when state->split is set]
909 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
911 commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
912 Author: Eliad Peller <eliad@wizery.com>
913 Date: Sun Jan 12 11:06:37 2014 +0200
915 mac80211: move roc cookie assignment earlier
917 ieee80211_start_roc_work() might add a new roc
918 to existing roc, and tell cfg80211 it has already
921 However, this might happen before the roc cookie
922 was set, resulting in REMAIN_ON_CHANNEL (started)
923 event with null cookie. Consequently, it can make
924 wpa_supplicant go out of sync.
926 Fix it by setting the roc cookie earlier.
928 Cc: stable@vger.kernel.org
929 Signed-off-by: Eliad Peller <eliad@wizery.com>
930 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
932 commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
933 Author: Johannes Berg <johannes.berg@intel.com>
934 Date: Fri Jan 24 14:06:29 2014 +0100
936 nl80211: send event when AP operation is stopped
938 There are a few cases, e.g. suspend, where an AP interface is
939 stopped by the kernel rather than by userspace request, most
940 commonly when suspending. To let userspace know about this,
941 send the NL80211_CMD_STOP_AP command as an event every time
942 an AP interface is stopped. This also happens when userspace
943 did in fact request the AP stop, but that's not a problem.
945 For full-MAC drivers this may need to be extended to also
946 cover cases where the device stopped the AP operation for
947 some reason, this a bit more complicated because then all
948 cfg80211 state also needs to be reset; such API is not part
951 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
953 commit d5d567eda7704f190379ca852a8f9a4112e3eee3
954 Author: Johannes Berg <johannes.berg@intel.com>
955 Date: Thu Jan 23 16:20:29 2014 +0100
957 mac80211: add length check in ieee80211_is_robust_mgmt_frame()
959 A few places weren't checking that the frame passed to the
960 function actually has enough data even though the function
961 clearly documents it must have a payload byte. Make this
962 safer by changing the function to take an skb and checking
963 the length inside. The old version is preserved for now as
964 the rtl* drivers use it and don't have a correct skb.
966 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
968 commit f8f6d212a047fc65c7d3442dfc038f65517236fc
969 Author: Johannes Berg <johannes.berg@intel.com>
970 Date: Fri Jan 24 10:53:53 2014 +0100
972 nl80211: fix scheduled scan RSSI matchset attribute confusion
974 The scheduled scan matchsets were intended to be a list of filters,
975 with the found BSS having to pass at least one of them to be passed
976 to the host. When the RSSI attribute was added, however, this was
977 broken and currently wpa_supplicant adds that attribute in its own
978 matchset; however, it doesn't intend that to mean that anything
979 that passes the RSSI filter should be passed to the host, instead
980 it wants it to mean that everything needs to also have higher RSSI.
982 This is semantically problematic because we have a list of filters
983 like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
984 one should be OR'ed and which one AND'ed.
986 To fix this, move the RSSI filter attribute into each matchset. As
987 we need to stay backward compatible, treat a matchset with only the
988 RSSI attribute as a "default RSSI filter" for all other matchsets,
989 but only if there are other matchsets (an RSSI-only matchset by
990 itself is still desirable.)
992 To make driver implementation easier, keep a global min_rssi_thold
993 for the entire request as well. The only affected driver is ath6kl.
995 I found this when I looked into the code after Raja Mani submitted
996 a patch fixing the n_match_sets calculation to disregard the RSSI,
997 but that patch didn't address the semantic issue.
999 Reported-by: Raja Mani <rmani@qti.qualcomm.com>
1000 Acked-by: Luciano Coelho <luciano.coelho@intel.com>
1001 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1003 commit de553e8545e65a6dc4e45f43df7e1443d4291922
1004 Author: Johannes Berg <johannes.berg@intel.com>
1005 Date: Fri Jan 24 10:17:47 2014 +0100
1007 nl80211: check nla_parse() return values
1009 If there's a policy, then nla_parse() return values must be
1010 checked, otherwise the policy is useless and there's nothing
1011 that ensures the attributes are actually what we expect them
1014 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1016 commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
1017 Author: Karl Beldan <karl.beldan@rivierawaves.com>
1018 Date: Thu Jan 23 20:06:34 2014 +0100
1020 mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
1022 ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
1023 the BA parameters. In the discussion [1] about this patch, Johannes
1024 recalled that it fixed some races with the DELBA and indeed this
1025 behavior was introduced in [2].
1026 While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
1027 their BA params TID AC violates the spec and is more a workaround for
1028 some drivers. Helmut expressed some concerns wrt such drivers, in
1029 particular DELBAs in rt2x00.
1031 ATM, DELBAs are sent after a driver has called (hence "purposely")
1032 ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
1033 details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
1034 given to the driver ampdu_action supposed to call this function, which
1035 could prove handy to people trying to do the right thing in faulty
1036 drivers (if their fw/hw don't get in their way).
1038 [1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
1039 [2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
1041 Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
1042 Cc: Helmut Schaa <helmut.schaa@googlemail.com>
1043 Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
1044 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1045 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
1046 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
1047 @@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
1048 if (nw_type & ADHOC_NETWORK) {
1049 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
1050 nw_type & ADHOC_CREATOR ? "creator" : "joiner");
1051 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1052 + cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
1053 cfg80211_put_bss(ar->wiphy, bss);
1056 @@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
1059 if (vif->nw_type & ADHOC_NETWORK) {
1060 - if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
1061 + if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
1062 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
1063 "%s: ath6k not in ibss mode\n", __func__);
1066 - memset(bssid, 0, ETH_ALEN);
1067 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1071 @@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
1072 struct ath6kl_vif *vif = netdev_priv(dev);
1074 int ret, rssi_thold;
1075 + int n_match_sets = request->n_match_sets;
1078 + * If there's a matchset w/o an SSID, then assume it's just for
1079 + * the RSSI (nothing else is currently supported) and ignore it.
1080 + * The device only supports a global RSSI filter that we set below.
1082 + if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
1085 if (ar->state != ATH6KL_STATE_ON)
1087 @@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
1088 ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
1090 request->match_sets,
1091 - request->n_match_sets);
1096 - if (!request->n_match_sets) {
1097 + if (!n_match_sets) {
1098 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
1101 @@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
1103 if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
1104 ar->fw_capabilities)) {
1105 - if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1106 + if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1108 - else if (request->rssi_thold < -127)
1109 + else if (request->min_rssi_thold < -127)
1112 - rssi_thold = request->rssi_thold;
1113 + rssi_thold = request->min_rssi_thold;
1115 ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
1117 --- a/drivers/net/wireless/ath/ath9k/hw.c
1118 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1119 @@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
1120 if (AR_SREV_9300_20_OR_LATER(ah))
1122 else if (AR_SREV_9100(ah))
1128 @@ -1534,7 +1534,7 @@ EXPORT_SYMBOL(ath9k_hw_check_nav);
1129 bool ath9k_hw_check_alive(struct ath_hw *ah)
1133 + u32 reg, last_val;
1135 if (AR_SREV_9300(ah))
1136 return !ath9k_hw_detect_mac_hang(ah);
1137 @@ -1542,9 +1542,13 @@ bool ath9k_hw_check_alive(struct ath_hw
1138 if (AR_SREV_9285_12_OR_LATER(ah))
1141 + last_val = REG_READ(ah, AR_OBS_BUS_1);
1143 reg = REG_READ(ah, AR_OBS_BUS_1);
1144 + if (reg != last_val)
1148 if ((reg & 0x7E7FFFEF) == 0x00702400)
1151 @@ -1556,6 +1560,8 @@ bool ath9k_hw_check_alive(struct ath_hw
1157 } while (count-- > 0);
1160 @@ -2051,9 +2057,8 @@ static bool ath9k_hw_set_power_awake(str
1162 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
1163 AR_RTC_FORCE_WAKE_EN);
1165 if (AR_SREV_9100(ah))
1171 --- a/drivers/net/wireless/ath/ath9k/main.c
1172 +++ b/drivers/net/wireless/ath/ath9k/main.c
1173 @@ -451,7 +451,7 @@ void ath9k_tasklet(unsigned long data)
1174 * interrupts are enabled in the reset routine.
1176 atomic_inc(&ah->intr_ref_cnt);
1177 - ath_dbg(common, ANY, "FATAL: Skipping interrupts\n");
1178 + ath_dbg(common, RESET, "FATAL: Skipping interrupts\n");
1182 @@ -471,7 +471,7 @@ void ath9k_tasklet(unsigned long data)
1183 * interrupts are enabled in the reset routine.
1185 atomic_inc(&ah->intr_ref_cnt);
1186 - ath_dbg(common, ANY,
1187 + ath_dbg(common, RESET,
1188 "BB_WATCHDOG: Skipping interrupts\n");
1191 @@ -484,7 +484,7 @@ void ath9k_tasklet(unsigned long data)
1192 type = RESET_TYPE_TX_GTT;
1193 ath9k_queue_reset(sc, type);
1194 atomic_inc(&ah->intr_ref_cnt);
1195 - ath_dbg(common, ANY,
1196 + ath_dbg(common, RESET,
1197 "GTT: Skipping interrupts\n");
1200 @@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
1202 static bool ath9k_has_tx_pending(struct ath_softc *sc)
1207 for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1208 if (!ATH_TXQ_SETUP(sc, i))
1209 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
1210 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
1211 @@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
1212 * config match list.
1214 for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
1215 + /* skip empty SSID matchsets */
1216 + if (!req->match_sets[i].ssid.ssid_len)
1218 scan->direct_scan[i].id = WLAN_EID_SSID;
1219 scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
1220 memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
1221 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1222 +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1223 @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
1224 /* During testing, hdr was NULL */
1227 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1228 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1229 (ieee80211_has_protected(hdr->frame_control)))
1230 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1232 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1233 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1234 @@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
1235 /* In testing, hdr was NULL here */
1238 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1239 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1240 (ieee80211_has_protected(hdr->frame_control)))
1241 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1243 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1244 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1245 @@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
1246 /* during testing, hdr was NULL here */
1249 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1250 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1251 (ieee80211_has_protected(hdr->frame_control)))
1252 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1254 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1255 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1256 @@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
1257 /* during testing, hdr could be NULL here */
1260 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1261 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1262 (ieee80211_has_protected(hdr->frame_control)))
1263 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1265 --- a/include/linux/ieee80211.h
1266 +++ b/include/linux/ieee80211.h
1267 @@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
1271 + * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
1272 + * @fc: frame control field in little-endian byteorder
1274 +static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
1276 + /* IEEE 802.11-2012, definition of "bufferable management frame";
1277 + * note that this ignores the IBSS special case. */
1278 + return ieee80211_is_mgmt(fc) &&
1279 + (ieee80211_is_action(fc) ||
1280 + ieee80211_is_disassoc(fc) ||
1281 + ieee80211_is_deauth(fc));
1285 * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
1286 * @seq_ctrl: frame sequence control bytes in little-endian byteorder
1288 @@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
1292 - * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1293 + * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1294 * @hdr: the frame (buffer must include at least the first octet of payload)
1296 -static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1297 +static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1299 if (ieee80211_is_disassoc(hdr->frame_control) ||
1300 ieee80211_is_deauth(hdr->frame_control))
1301 @@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
1305 + * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
1306 + * @skb: the skb containing the frame, length will be checked
1308 +static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
1310 + if (skb->len < 25)
1312 + return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
1316 * ieee80211_is_public_action - check if frame is a public action frame
1318 * @len: length of the frame
1319 --- a/include/net/cfg80211.h
1320 +++ b/include/net/cfg80211.h
1321 @@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
1322 * struct cfg80211_match_set - sets of attributes to match
1324 * @ssid: SSID to be matched
1325 + * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1327 struct cfg80211_match_set {
1328 struct cfg80211_ssid ssid;
1333 @@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
1334 * @dev: the interface
1335 * @scan_start: start time of the scheduled scan
1336 * @channels: channels to scan
1337 - * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1338 + * @min_rssi_thold: for drivers only supporting a single threshold, this
1339 + * contains the minimum over all matchsets
1341 struct cfg80211_sched_scan_request {
1342 struct cfg80211_ssid *ssids;
1343 @@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
1345 struct cfg80211_match_set *match_sets;
1348 + s32 min_rssi_thold;
1351 struct wiphy *wiphy;
1352 @@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
1353 * @identifier: (private) Identifier used in nl80211 to identify this
1354 * wireless device if it has no netdev
1355 * @current_bss: (private) Used by the internal configuration code
1356 - * @channel: (private) Used by the internal configuration code to track
1357 - * the user-set AP, monitor and WDS channel
1358 + * @chandef: (private) Used by the internal configuration code to track
1359 + * the user-set channel definition.
1360 * @preset_chandef: (private) Used by the internal configuration code to
1361 * track the channel to be used for AP later
1362 * @bssid: (private) Used by the internal configuration code
1363 @@ -3195,9 +3198,7 @@ struct wireless_dev {
1365 struct cfg80211_internal_bss *current_bss; /* associated / joined */
1366 struct cfg80211_chan_def preset_chandef;
1368 - /* for AP and mesh channel tracking */
1369 - struct ieee80211_channel *channel;
1370 + struct cfg80211_chan_def chandef;
1373 bool ibss_dfs_possible;
1374 @@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
1376 * @dev: network device
1377 * @bssid: the BSSID of the IBSS joined
1378 + * @channel: the channel of the IBSS joined
1379 * @gfp: allocation flags
1381 * This function notifies cfg80211 that the device joined an IBSS or
1382 @@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
1383 * with the locally generated beacon -- this guarantees that there is
1384 * always a scan result for this IBSS. cfg80211 will handle the rest.
1386 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
1387 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1388 + struct ieee80211_channel *channel, gfp_t gfp);
1391 * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
1392 --- a/include/uapi/linux/nl80211.h
1393 +++ b/include/uapi/linux/nl80211.h
1394 @@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
1395 * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
1396 * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
1397 * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
1398 - * only report BSS with matching SSID.
1399 + * only report BSS with matching SSID.
1400 * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
1401 - * BSS in scan results. Filtering is turned off if not specified.
1402 + * BSS in scan results. Filtering is turned off if not specified. Note that
1403 + * if this attribute is in a match set of its own, then it is treated as
1404 + * the default value for all matchsets with an SSID, rather than being a
1405 + * matchset of its own without an RSSI filter. This is due to problems with
1406 + * how this API was implemented in the past. Also, due to the same problem,
1407 + * the only way to create a matchset with only an RSSI filter (with this
1408 + * attribute) is if there's only a single matchset with the RSSI attribute.
1409 * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
1410 * attribute number currently defined
1411 * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
1412 --- a/net/mac80211/agg-tx.c
1413 +++ b/net/mac80211/agg-tx.c
1414 @@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
1415 mgmt->u.action.u.addba_req.start_seq_num =
1416 cpu_to_le16(start_seq_num << 4);
1418 - ieee80211_tx_skb_tid(sdata, skb, tid);
1419 + ieee80211_tx_skb(sdata, skb);
1422 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
1423 --- a/net/mac80211/cfg.c
1424 +++ b/net/mac80211/cfg.c
1425 @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
1426 /* TODO: make hostapd tell us what it wants */
1427 sdata->smps_mode = IEEE80211_SMPS_OFF;
1428 sdata->needed_rx_chains = sdata->local->rx_chains;
1429 - sdata->radar_required = params->radar_required;
1431 mutex_lock(&local->mtx);
1432 + sdata->radar_required = params->radar_required;
1433 err = ieee80211_vif_use_channel(sdata, ¶ms->chandef,
1434 IEEE80211_CHANCTX_SHARED);
1435 mutex_unlock(&local->mtx);
1436 @@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
1437 IEEE80211_P2P_OPPPS_ENABLE_BIT;
1439 err = ieee80211_assign_beacon(sdata, ¶ms->beacon);
1442 + ieee80211_vif_release_channel(sdata);
1447 err = drv_start_ap(sdata->local, sdata);
1448 @@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
1450 kfree_rcu(old, rcu_head);
1451 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
1452 + ieee80211_vif_release_channel(sdata);
1456 @@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
1459 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
1460 + sdata_assert_lock(sdata);
1462 /* don't allow changing the beacon while CSA is in place - offset
1463 * of channel switch counter may change
1464 @@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
1465 struct probe_resp *old_probe_resp;
1466 struct cfg80211_chan_def chandef;
1468 + sdata_assert_lock(sdata);
1470 old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
1473 @@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
1474 kfree(sdata->u.ap.next_beacon);
1475 sdata->u.ap.next_beacon = NULL;
1477 - cancel_work_sync(&sdata->u.ap.request_smps_work);
1479 /* turn off carrier for this interface and dependent VLANs */
1480 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1481 netif_carrier_off(vlan->dev);
1482 @@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
1483 kfree_rcu(old_beacon, rcu_head);
1485 kfree_rcu(old_probe_resp, rcu_head);
1486 + sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
1488 __sta_info_flush(sdata, true);
1489 ieee80211_free_keys(sdata, true);
1490 @@ -2638,6 +2643,24 @@ static int ieee80211_start_roc_work(stru
1491 INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
1492 INIT_LIST_HEAD(&roc->dependents);
1495 + * cookie is either the roc cookie (for normal roc)
1496 + * or the SKB (for mgmt TX)
1499 + /* local->mtx protects this */
1500 + local->roc_cookie_counter++;
1501 + roc->cookie = local->roc_cookie_counter;
1502 + /* wow, you wrapped 64 bits ... more likely a bug */
1503 + if (WARN_ON(roc->cookie == 0)) {
1505 + local->roc_cookie_counter++;
1507 + *cookie = roc->cookie;
1509 + *cookie = (unsigned long)txskb;
1512 /* if there's one pending or we're scanning, queue this one */
1513 if (!list_empty(&local->roc_list) ||
1514 local->scanning || local->radar_detect_enabled)
1515 @@ -2772,24 +2795,6 @@ static int ieee80211_start_roc_work(stru
1517 list_add_tail(&roc->list, &local->roc_list);
1520 - * cookie is either the roc cookie (for normal roc)
1521 - * or the SKB (for mgmt TX)
1524 - /* local->mtx protects this */
1525 - local->roc_cookie_counter++;
1526 - roc->cookie = local->roc_cookie_counter;
1527 - /* wow, you wrapped 64 bits ... more likely a bug */
1528 - if (WARN_ON(roc->cookie == 0)) {
1530 - local->roc_cookie_counter++;
1532 - *cookie = roc->cookie;
1534 - *cookie = (unsigned long)txskb;
1540 @@ -3004,8 +3009,10 @@ void ieee80211_csa_finalize_work(struct
1541 if (!ieee80211_sdata_running(sdata))
1544 - sdata->radar_required = sdata->csa_radar_required;
1545 + sdata_assert_lock(sdata);
1547 mutex_lock(&local->mtx);
1548 + sdata->radar_required = sdata->csa_radar_required;
1549 err = ieee80211_vif_change_channel(sdata, &changed);
1550 mutex_unlock(&local->mtx);
1551 if (WARN_ON(err < 0))
1552 @@ -3022,13 +3029,13 @@ void ieee80211_csa_finalize_work(struct
1553 switch (sdata->vif.type) {
1554 case NL80211_IFTYPE_AP:
1555 err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
1556 + kfree(sdata->u.ap.next_beacon);
1557 + sdata->u.ap.next_beacon = NULL;
1563 - kfree(sdata->u.ap.next_beacon);
1564 - sdata->u.ap.next_beacon = NULL;
1566 ieee80211_bss_info_change_notify(sdata, err);
1568 case NL80211_IFTYPE_ADHOC:
1569 @@ -3066,7 +3073,7 @@ int ieee80211_channel_switch(struct wiph
1570 struct ieee80211_if_mesh __maybe_unused *ifmsh;
1571 int err, num_chanctx;
1573 - lockdep_assert_held(&sdata->wdev.mtx);
1574 + sdata_assert_lock(sdata);
1576 if (!list_empty(&local->roc_list) || local->scanning)
1578 --- a/net/mac80211/ht.c
1579 +++ b/net/mac80211/ht.c
1580 @@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
1581 mgmt->u.action.u.delba.params = cpu_to_le16(params);
1582 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
1584 - ieee80211_tx_skb_tid(sdata, skb, tid);
1585 + ieee80211_tx_skb(sdata, skb);
1588 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
1589 @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
1590 u.ap.request_smps_work);
1593 - __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
1594 + if (sdata_dereference(sdata->u.ap.beacon, sdata))
1595 + __ieee80211_request_smps_ap(sdata,
1596 + sdata->u.ap.driver_smps_mode);
1597 sdata_unlock(sdata);
1600 --- a/net/mac80211/iface.c
1601 +++ b/net/mac80211/iface.c
1602 @@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
1604 ieee80211_roc_purge(local, sdata);
1606 - if (sdata->vif.type == NL80211_IFTYPE_STATION)
1607 + switch (sdata->vif.type) {
1608 + case NL80211_IFTYPE_STATION:
1609 ieee80211_mgd_stop(sdata);
1611 - if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
1613 + case NL80211_IFTYPE_ADHOC:
1614 ieee80211_ibss_stop(sdata);
1617 + case NL80211_IFTYPE_AP:
1618 + cancel_work_sync(&sdata->u.ap.request_smps_work);
1625 * Remove all stations associated with this interface.
1626 @@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
1627 cancel_work_sync(&local->dynamic_ps_enable_work);
1629 cancel_work_sync(&sdata->recalc_smps);
1630 + sdata_lock(sdata);
1631 sdata->vif.csa_active = false;
1632 + sdata_unlock(sdata);
1633 cancel_work_sync(&sdata->csa_finalize_work);
1635 cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
1636 --- a/net/mac80211/rx.c
1637 +++ b/net/mac80211/rx.c
1638 @@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
1640 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1642 - if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
1643 + if (is_multicast_ether_addr(hdr->addr1))
1646 - return ieee80211_is_robust_mgmt_frame(hdr);
1647 + return ieee80211_is_robust_mgmt_frame(skb);
1651 @@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
1653 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1655 - if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
1656 + if (!is_multicast_ether_addr(hdr->addr1))
1659 - return ieee80211_is_robust_mgmt_frame(hdr);
1660 + return ieee80211_is_robust_mgmt_frame(skb);
1664 @@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
1665 if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
1668 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
1669 + if (!ieee80211_is_robust_mgmt_frame(skb))
1670 return -1; /* not a robust management frame */
1672 mmie = (struct ieee80211_mmie *)
1673 @@ -1128,6 +1128,13 @@ static void sta_ps_end(struct sta_info *
1674 sta->sta.addr, sta->sta.aid);
1676 if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1678 + * Clear the flag only if the other one is still set
1679 + * so that the TX path won't start TX'ing new frames
1680 + * directly ... In the case that the driver flag isn't
1681 + * set ieee80211_sta_ps_deliver_wakeup() will clear it.
1683 + clear_sta_flag(sta, WLAN_STA_PS_STA);
1684 ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
1685 sta->sta.addr, sta->sta.aid);
1687 @@ -1311,18 +1318,15 @@ ieee80211_rx_h_sta_process(struct ieee80
1688 !ieee80211_has_morefrags(hdr->frame_control) &&
1689 !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
1690 (rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1691 - rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
1692 + rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1693 + /* PM bit is only checked in frames where it isn't reserved,
1694 + * in AP mode it's reserved in non-bufferable management frames
1695 + * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1697 + (!ieee80211_is_mgmt(hdr->frame_control) ||
1698 + ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1699 if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
1701 - * Ignore doze->wake transitions that are
1702 - * indicated by non-data frames, the standard
1703 - * is unclear here, but for example going to
1704 - * PS mode and then scanning would cause a
1705 - * doze->wake transition for the probe request,
1706 - * and that is clearly undesirable.
1708 - if (ieee80211_is_data(hdr->frame_control) &&
1709 - !ieee80211_has_pm(hdr->frame_control))
1710 + if (!ieee80211_has_pm(hdr->frame_control))
1713 if (ieee80211_has_pm(hdr->frame_control))
1714 @@ -1845,8 +1849,7 @@ static int ieee80211_drop_unencrypted_mg
1715 * having configured keys.
1717 if (unlikely(ieee80211_is_action(fc) && !rx->key &&
1718 - ieee80211_is_robust_mgmt_frame(
1719 - (struct ieee80211_hdr *) rx->skb->data)))
1720 + ieee80211_is_robust_mgmt_frame(rx->skb)))
1724 --- a/net/mac80211/tx.c
1725 +++ b/net/mac80211/tx.c
1726 @@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc,
1727 if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
1730 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
1732 + if (!ieee80211_is_robust_mgmt_frame(skb))
1736 @@ -478,6 +477,20 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1737 sta->sta.addr, sta->sta.aid, ac);
1738 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
1739 purge_old_ps_buffers(tx->local);
1741 + /* sync with ieee80211_sta_ps_deliver_wakeup */
1742 + spin_lock(&sta->ps_lock);
1744 + * STA woke up the meantime and all the frames on ps_tx_buf have
1745 + * been queued to pending queue. No reordering can happen, go
1746 + * ahead and Tx the packet.
1748 + if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
1749 + !test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1750 + spin_unlock(&sta->ps_lock);
1751 + return TX_CONTINUE;
1754 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
1755 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
1757 @@ -492,6 +505,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1758 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
1759 info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
1760 skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb);
1761 + spin_unlock(&sta->ps_lock);
1763 if (!timer_pending(&local->sta_cleanup))
1764 mod_timer(&local->sta_cleanup,
1765 @@ -525,9 +539,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
1767 /* only deauth, disassoc and action are bufferable MMPDUs */
1768 if (ieee80211_is_mgmt(hdr->frame_control) &&
1769 - !ieee80211_is_deauth(hdr->frame_control) &&
1770 - !ieee80211_is_disassoc(hdr->frame_control) &&
1771 - !ieee80211_is_action(hdr->frame_control)) {
1772 + !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
1773 if (tx->flags & IEEE80211_TX_UNICAST)
1774 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1776 @@ -567,7 +579,7 @@ ieee80211_tx_h_select_key(struct ieee802
1778 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1779 is_multicast_ether_addr(hdr->addr1) &&
1780 - ieee80211_is_robust_mgmt_frame(hdr) &&
1781 + ieee80211_is_robust_mgmt_frame(tx->skb) &&
1782 (key = rcu_dereference(tx->sdata->default_mgmt_key)))
1784 else if (is_multicast_ether_addr(hdr->addr1) &&
1785 @@ -582,12 +594,12 @@ ieee80211_tx_h_select_key(struct ieee802
1787 else if (tx->skb->protocol == tx->sdata->control_port_protocol)
1789 - else if (ieee80211_is_robust_mgmt_frame(hdr) &&
1790 + else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
1791 !(ieee80211_is_action(hdr->frame_control) &&
1792 tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
1794 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1795 - !ieee80211_is_robust_mgmt_frame(hdr))
1796 + !ieee80211_is_robust_mgmt_frame(tx->skb))
1799 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
1800 @@ -878,7 +890,7 @@ static int ieee80211_fragment(struct iee
1803 /* adjust first fragment's length */
1804 - skb->len = hdrlen + per_fragm;
1805 + skb_trim(skb, hdrlen + per_fragm);
1809 --- a/net/mac80211/wpa.c
1810 +++ b/net/mac80211/wpa.c
1811 @@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
1812 hdrlen = ieee80211_hdrlen(hdr->frame_control);
1814 if (!ieee80211_is_data(hdr->frame_control) &&
1815 - !ieee80211_is_robust_mgmt_frame(hdr))
1816 + !ieee80211_is_robust_mgmt_frame(skb))
1819 data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
1820 --- a/net/wireless/ap.c
1821 +++ b/net/wireless/ap.c
1822 @@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
1823 err = rdev_stop_ap(rdev, dev);
1825 wdev->beacon_interval = 0;
1826 - wdev->channel = NULL;
1827 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
1829 rdev_set_qos_map(rdev, dev, NULL);
1830 + nl80211_send_ap_stopped(wdev);
1834 --- a/net/wireless/core.c
1835 +++ b/net/wireless/core.c
1836 @@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
1840 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1841 - !rdev->scan_req->notified);
1842 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1843 + if (WARN_ON(!rdev->scan_req->notified))
1844 + rdev->scan_req->aborted = true;
1845 + ___cfg80211_scan_done(rdev, false);
1849 static int cfg80211_rfkill_set_block(void *data, bool blocked)
1850 @@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
1852 u16 ifmodes = wiphy->interface_modes;
1854 - /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
1855 - wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
1858 * There are major locking problems in nl80211/mac80211 for CSA,
1859 * disable for all drivers until this has been reworked.
1860 @@ -875,8 +875,11 @@ static int cfg80211_netdev_notifier_call
1863 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
1864 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1865 - !rdev->scan_req->notified);
1866 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1867 + if (WARN_ON(!rdev->scan_req->notified))
1868 + rdev->scan_req->aborted = true;
1869 + ___cfg80211_scan_done(rdev, false);
1872 if (WARN_ON(rdev->sched_scan_req &&
1873 rdev->sched_scan_req->dev == wdev->netdev)) {
1874 --- a/net/wireless/core.h
1875 +++ b/net/wireless/core.h
1876 @@ -62,6 +62,7 @@ struct cfg80211_registered_device {
1877 struct rb_root bss_tree;
1879 struct cfg80211_scan_request *scan_req; /* protected by RTNL */
1880 + struct sk_buff *scan_msg;
1881 struct cfg80211_sched_scan_request *sched_scan_req;
1882 unsigned long suspend_at;
1883 struct work_struct scan_done_wk;
1884 @@ -210,6 +211,7 @@ struct cfg80211_event {
1888 + struct ieee80211_channel *channel;
1892 @@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
1893 struct net_device *dev, bool nowext);
1894 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
1895 struct net_device *dev, bool nowext);
1896 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
1897 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1898 + struct ieee80211_channel *channel);
1899 int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
1900 struct wireless_dev *wdev);
1902 @@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
1903 struct key_params *params, int key_idx,
1904 bool pairwise, const u8 *mac_addr);
1905 void __cfg80211_scan_done(struct work_struct *wk);
1906 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
1907 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
1908 + bool send_message);
1909 void __cfg80211_sched_scan_results(struct work_struct *wk);
1910 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
1911 bool driver_initiated);
1912 @@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
1914 cfg80211_get_chan_state(struct wireless_dev *wdev,
1915 struct ieee80211_channel **chan,
1916 - enum cfg80211_chan_mode *chanmode);
1917 + enum cfg80211_chan_mode *chanmode,
1918 + u8 *radar_detect);
1920 int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
1921 struct cfg80211_chan_def *chandef);
1922 --- a/net/wireless/nl80211.c
1923 +++ b/net/wireless/nl80211.c
1924 @@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
1925 * We can then retry with the larger buffer.
1927 if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
1929 + !skb->len && !state->split &&
1930 cb->min_dump_alloc < 4096) {
1931 cb->min_dump_alloc = 4096;
1932 + state->split_start = 0;
1936 @@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
1937 nla_for_each_nested(nl_txq_params,
1938 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
1940 - nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1941 - nla_data(nl_txq_params),
1942 - nla_len(nl_txq_params),
1943 - txq_params_policy);
1944 + result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1945 + nla_data(nl_txq_params),
1946 + nla_len(nl_txq_params),
1947 + txq_params_policy);
1950 result = parse_txq_params(tb, &txq_params);
1953 @@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
1955 wdev->preset_chandef = params.chandef;
1956 wdev->beacon_interval = params.beacon_interval;
1957 - wdev->channel = params.chandef.chan;
1958 + wdev->chandef = params.chandef;
1959 wdev->ssid_len = params.ssid_len;
1960 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
1962 @@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
1964 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
1966 - nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1967 - nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1969 + r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1970 + nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1974 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
1977 @@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
1978 if (!rdev->ops->scan)
1981 - if (rdev->scan_req) {
1982 + if (rdev->scan_req || rdev->scan_msg) {
1986 @@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
1987 enum ieee80211_band band;
1989 struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
1990 + s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
1992 if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
1993 !rdev->ops->sched_scan_start)
1994 @@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
1995 if (n_ssids > wiphy->max_sched_scan_ssids)
1998 - if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
2000 + * First, count the number of 'real' matchsets. Due to an issue with
2001 + * the old implementation, matchsets containing only the RSSI attribute
2002 + * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
2003 + * RSSI for all matchsets, rather than their own matchset for reporting
2004 + * all APs with a strong RSSI. This is needed to be compatible with
2005 + * older userspace that treated a matchset with only the RSSI as the
2006 + * global RSSI for all other matchsets - if there are other matchsets.
2008 + if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
2009 nla_for_each_nested(attr,
2010 info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
2014 + struct nlattr *rssi;
2016 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2017 + nla_data(attr), nla_len(attr),
2018 + nl80211_match_policy);
2021 + /* add other standalone attributes here */
2022 + if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
2026 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2028 + default_match_rssi = nla_get_s32(rssi);
2032 + /* However, if there's no other matchset, add the RSSI one */
2033 + if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
2036 if (n_match_sets > wiphy->max_match_sets)
2038 @@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
2040 struct nlattr *ssid, *rssi;
2042 - nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2043 - nla_data(attr), nla_len(attr),
2044 - nl80211_match_policy);
2045 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2046 + nla_data(attr), nla_len(attr),
2047 + nl80211_match_policy);
2050 ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
2052 + if (WARN_ON(i >= n_match_sets)) {
2053 + /* this indicates a programming error,
2054 + * the loop above should have verified
2061 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
2064 @@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
2065 nla_data(ssid), nla_len(ssid));
2066 request->match_sets[i].ssid.ssid_len =
2068 + /* special attribute - old implemenation w/a */
2069 + request->match_sets[i].rssi_thold =
2070 + default_match_rssi;
2071 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2073 + request->match_sets[i].rssi_thold =
2074 + nla_get_s32(rssi);
2076 - rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2078 - request->rssi_thold = nla_get_u32(rssi);
2080 - request->rssi_thold =
2081 - NL80211_SCAN_RSSI_THOLD_OFF;
2085 + /* there was no other matchset, so the RSSI one is alone */
2087 + request->match_sets[0].rssi_thold = default_match_rssi;
2089 + request->min_rssi_thold = INT_MAX;
2090 + for (i = 0; i < n_match_sets; i++)
2091 + request->min_rssi_thold =
2092 + min(request->match_sets[i].rssi_thold,
2093 + request->min_rssi_thold);
2095 + request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
2098 if (info->attrs[NL80211_ATTR_IE]) {
2099 @@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
2101 err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
2103 - wdev->channel = chandef.chan;
2104 + wdev->chandef = chandef;
2105 wdev->cac_started = true;
2106 wdev->cac_start_time = jiffies;
2108 @@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
2109 * directly to the enum ieee80211_band values used in cfg80211.
2111 BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
2112 - nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
2114 + nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
2115 enum ieee80211_band band = nla_type(tx_rates);
2118 if (band < 0 || band >= IEEE80211_NUM_BANDS)
2120 sband = rdev->wiphy.bands[band];
2123 - nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2124 - nla_len(tx_rates), nl80211_txattr_policy);
2125 + err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2126 + nla_len(tx_rates), nl80211_txattr_policy);
2129 if (tb[NL80211_TXRATE_LEGACY]) {
2130 mask.control[band].legacy = rateset_to_mask(
2132 @@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
2133 NL80211_MCGRP_SCAN, GFP_KERNEL);
2136 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2137 - struct wireless_dev *wdev)
2138 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2139 + struct wireless_dev *wdev, bool aborted)
2141 struct sk_buff *msg;
2143 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2148 if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2149 - NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2150 + aborted ? NL80211_CMD_SCAN_ABORTED :
2151 + NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2157 - genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2158 - NL80211_MCGRP_SCAN, GFP_KERNEL);
2162 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2163 - struct wireless_dev *wdev)
2164 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2165 + struct sk_buff *msg)
2167 - struct sk_buff *msg;
2169 - msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2173 - if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2174 - NL80211_CMD_SCAN_ABORTED) < 0) {
2179 genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2180 NL80211_MCGRP_SCAN, GFP_KERNEL);
2182 @@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
2183 wdev->iftype != NL80211_IFTYPE_MESH_POINT))
2186 - wdev->channel = chandef->chan;
2187 + wdev->chandef = *chandef;
2188 + wdev->preset_chandef = *chandef;
2189 nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
2191 EXPORT_SYMBOL(cfg80211_ch_switch_notify);
2192 @@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct
2194 EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
2196 +void nl80211_send_ap_stopped(struct wireless_dev *wdev)
2198 + struct wiphy *wiphy = wdev->wiphy;
2199 + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
2200 + struct sk_buff *msg;
2203 + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2207 + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
2211 + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
2212 + nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
2213 + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
2216 + genlmsg_end(msg, hdr);
2218 + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
2219 + NL80211_MCGRP_MLME, GFP_KERNEL);
2225 /* initialisation/exit functions */
2227 int nl80211_init(void)
2228 --- a/net/wireless/nl80211.h
2229 +++ b/net/wireless/nl80211.h
2230 @@ -8,10 +8,10 @@ void nl80211_exit(void);
2231 void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
2232 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
2233 struct wireless_dev *wdev);
2234 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2235 - struct wireless_dev *wdev);
2236 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2237 - struct wireless_dev *wdev);
2238 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2239 + struct wireless_dev *wdev, bool aborted);
2240 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2241 + struct sk_buff *msg);
2242 void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
2243 struct net_device *netdev, u32 cmd);
2244 void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
2245 @@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
2246 enum nl80211_radar_event event,
2247 struct net_device *netdev, gfp_t gfp);
2249 +void nl80211_send_ap_stopped(struct wireless_dev *wdev);
2251 void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
2253 #endif /* __NET_WIRELESS_NL80211_H */
2254 --- a/net/wireless/scan.c
2255 +++ b/net/wireless/scan.c
2256 @@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
2257 dev->bss_generation++;
2260 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
2261 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2262 + bool send_message)
2264 struct cfg80211_scan_request *request;
2265 struct wireless_dev *wdev;
2266 + struct sk_buff *msg;
2267 #ifdef CPTCFG_CFG80211_WEXT
2268 union iwreq_data wrqu;
2273 - request = rdev->scan_req;
2274 + if (rdev->scan_msg) {
2275 + nl80211_send_scan_result(rdev, rdev->scan_msg);
2276 + rdev->scan_msg = NULL;
2280 + request = rdev->scan_req;
2284 @@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
2286 cfg80211_sme_scan_done(wdev->netdev);
2288 - if (request->aborted) {
2289 - nl80211_send_scan_aborted(rdev, wdev);
2291 - if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
2292 - /* flush entries from previous scans */
2293 - spin_lock_bh(&rdev->bss_lock);
2294 - __cfg80211_bss_expire(rdev, request->scan_start);
2295 - spin_unlock_bh(&rdev->bss_lock);
2297 - nl80211_send_scan_done(rdev, wdev);
2298 + if (!request->aborted &&
2299 + request->flags & NL80211_SCAN_FLAG_FLUSH) {
2300 + /* flush entries from previous scans */
2301 + spin_lock_bh(&rdev->bss_lock);
2302 + __cfg80211_bss_expire(rdev, request->scan_start);
2303 + spin_unlock_bh(&rdev->bss_lock);
2306 + msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
2308 #ifdef CPTCFG_CFG80211_WEXT
2309 if (wdev->netdev && !request->aborted) {
2310 memset(&wrqu, 0, sizeof(wrqu));
2311 @@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
2313 rdev->scan_req = NULL;
2316 + if (!send_message)
2317 + rdev->scan_msg = msg;
2319 + nl80211_send_scan_result(rdev, msg);
2322 void __cfg80211_scan_done(struct work_struct *wk)
2323 @@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
2327 - ___cfg80211_scan_done(rdev);
2328 + ___cfg80211_scan_done(rdev, true);
2332 @@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
2334 return PTR_ERR(rdev);
2336 - if (rdev->scan_req) {
2337 + if (rdev->scan_req || rdev->scan_msg) {
2341 @@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
2343 return PTR_ERR(rdev);
2345 - if (rdev->scan_req)
2346 + if (rdev->scan_req || rdev->scan_msg)
2349 res = ieee80211_scan_results(rdev, info, extra, data->length);
2350 --- a/net/wireless/sme.c
2351 +++ b/net/wireless/sme.c
2352 @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
2353 ASSERT_RDEV_LOCK(rdev);
2354 ASSERT_WDEV_LOCK(wdev);
2356 - if (rdev->scan_req)
2357 + if (rdev->scan_req || rdev->scan_msg)
2360 if (wdev->conn->params.channel)
2361 --- a/net/mac80211/mlme.c
2362 +++ b/net/mac80211/mlme.c
2363 @@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct
2366 ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
2367 - sdata->vif.csa_active = true;
2369 mutex_lock(&local->chanctx_mtx);
2370 if (local->use_chanctx) {
2371 @@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct
2372 mutex_unlock(&local->chanctx_mtx);
2374 sdata->csa_chandef = csa_ie.chandef;
2375 + sdata->vif.csa_active = true;
2378 ieee80211_stop_queues_by_reason(&local->hw,
2379 --- a/net/mac80211/chan.c
2380 +++ b/net/mac80211/chan.c
2381 @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
2383 struct ieee80211_sub_if_data *sdata;
2385 + lockdep_assert_held(&local->mtx);
2388 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2389 if (sdata->radar_required) {
2390 --- a/net/mac80211/ibss.c
2391 +++ b/net/mac80211/ibss.c
2392 @@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
2395 mutex_lock(&local->mtx);
2396 - ieee80211_vif_release_channel(sdata);
2397 if (ieee80211_vif_use_channel(sdata, &chandef,
2398 ifibss->fixed_channel ?
2399 IEEE80211_CHANCTX_SHARED :
2400 @@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
2401 mutex_unlock(&local->mtx);
2404 + sdata->radar_required = radar_required;
2405 mutex_unlock(&local->mtx);
2407 memcpy(ifibss->bssid, bssid, ETH_ALEN);
2408 @@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
2409 rcu_assign_pointer(ifibss->presp, presp);
2410 mgmt = (void *)presp->head;
2412 - sdata->radar_required = radar_required;
2413 sdata->vif.bss_conf.enable_beacon = true;
2414 sdata->vif.bss_conf.beacon_int = beacon_int;
2415 sdata->vif.bss_conf.basic_rates = basic_rates;
2416 @@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
2417 presp->head_len, 0, GFP_KERNEL);
2418 cfg80211_put_bss(local->hw.wiphy, bss);
2419 netif_carrier_on(sdata->dev);
2420 - cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
2421 + cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
2424 static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
2425 @@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
2429 + sdata_assert_lock(sdata);
2431 sta_flags = IEEE80211_STA_DISABLE_VHT;
2432 switch (ifibss->chandef.width) {
2433 case NL80211_CHAN_WIDTH_5:
2434 @@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
2435 memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
2436 ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
2437 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
2439 + /* avoid excessive retries for probe request to wildcard SSIDs */
2441 + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
2443 ieee80211_tx_skb(sdata, skb);
2446 --- a/net/mac80211/mesh.c
2447 +++ b/net/mac80211/mesh.c
2448 @@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct
2449 if (!ifmsh->mesh_id)
2452 + sdata_assert_lock(sdata);
2454 sta_flags = IEEE80211_STA_DISABLE_VHT;
2455 switch (sdata->vif.bss_conf.chandef.width) {
2456 case NL80211_CHAN_WIDTH_20_NOHT:
2457 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2458 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2459 @@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
2460 struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
2461 struct net_device *ndev = ifp->ndev;
2462 struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
2463 + struct ieee80211_channel *chan;
2466 if (ifp->vif->mode == WL_MODE_AP) {
2467 @@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
2468 } else if (brcmf_is_linkup(e)) {
2469 brcmf_dbg(CONN, "Linkup\n");
2470 if (brcmf_is_ibssmode(ifp->vif)) {
2471 + chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
2472 memcpy(profile->bssid, e->addr, ETH_ALEN);
2473 wl_inform_ibss(cfg, ndev, e->addr);
2474 - cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
2475 + cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
2476 clear_bit(BRCMF_VIF_STATUS_CONNECTING,
2477 &ifp->vif->sme_state);
2478 set_bit(BRCMF_VIF_STATUS_CONNECTED,
2479 --- a/drivers/net/wireless/libertas/cfg.c
2480 +++ b/drivers/net/wireless/libertas/cfg.c
2481 @@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
2482 memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
2483 priv->wdev->ssid_len = params->ssid_len;
2485 - cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
2486 + cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
2489 /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
2490 priv->connect_status = LBS_CONNECTED;
2491 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2492 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2493 @@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy
2497 - cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
2498 + cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
2499 + params->chandef.chan, GFP_KERNEL);
2500 dev_dbg(priv->adapter->dev,
2501 "info: joined/created adhoc network with bssid"
2502 " %pM successfully\n", priv->cfg_bssid);
2503 --- a/drivers/net/wireless/rndis_wlan.c
2504 +++ b/drivers/net/wireless/rndis_wlan.c
2505 @@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
2506 bssid, req_ie, req_ie_len,
2507 resp_ie, resp_ie_len, GFP_KERNEL);
2508 } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
2509 - cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
2510 + cfg80211_ibss_joined(usbdev->net, bssid,
2511 + get_current_channel(usbdev, NULL),
2516 --- a/net/wireless/ibss.c
2517 +++ b/net/wireless/ibss.c
2519 #include "rdev-ops.h"
2522 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
2523 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2524 + struct ieee80211_channel *channel)
2526 struct wireless_dev *wdev = dev->ieee80211_ptr;
2527 struct cfg80211_bss *bss;
2528 @@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
2529 if (!wdev->ssid_len)
2532 - bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
2533 - wdev->ssid, wdev->ssid_len,
2534 + bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
2535 WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
2538 @@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
2542 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
2543 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2544 + struct ieee80211_channel *channel, gfp_t gfp)
2546 struct wireless_dev *wdev = dev->ieee80211_ptr;
2547 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
2548 struct cfg80211_event *ev;
2549 unsigned long flags;
2551 - trace_cfg80211_ibss_joined(dev, bssid);
2552 + trace_cfg80211_ibss_joined(dev, bssid, channel);
2554 + if (WARN_ON(!channel))
2557 ev = kzalloc(sizeof(*ev), gfp);
2561 ev->type = EVENT_IBSS_JOINED;
2562 - memcpy(ev->cr.bssid, bssid, ETH_ALEN);
2563 + memcpy(ev->ij.bssid, bssid, ETH_ALEN);
2564 + ev->ij.channel = channel;
2566 spin_lock_irqsave(&wdev->event_lock, flags);
2567 list_add_tail(&ev->list, &wdev->event_list);
2568 @@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
2570 wdev->ibss_fixed = params->channel_fixed;
2571 wdev->ibss_dfs_possible = params->userspace_handles_dfs;
2572 + wdev->chandef = params->chandef;
2573 #ifdef CPTCFG_CFG80211_WEXT
2574 wdev->wext.ibss.chandef = params->chandef;
2576 @@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
2578 wdev->current_bss = NULL;
2580 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2581 #ifdef CPTCFG_CFG80211_WEXT
2583 wdev->wext.ibss.ssid_len = 0;
2584 --- a/net/wireless/trace.h
2585 +++ b/net/wireless/trace.h
2586 @@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
2587 TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
2590 -DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
2591 - TP_PROTO(struct net_device *netdev, const u8 *addr),
2592 - TP_ARGS(netdev, addr)
2595 DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
2596 TP_PROTO(struct net_device *netdev, const u8 *addr),
2597 TP_ARGS(netdev, addr)
2598 @@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
2599 TP_ARGS(netdev, addr)
2602 +TRACE_EVENT(cfg80211_ibss_joined,
2603 + TP_PROTO(struct net_device *netdev, const u8 *bssid,
2604 + struct ieee80211_channel *channel),
2605 + TP_ARGS(netdev, bssid, channel),
2613 + MAC_ASSIGN(bssid, bssid);
2614 + CHAN_ASSIGN(channel);
2616 + TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
2617 + NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
2620 TRACE_EVENT(cfg80211_probe_status,
2621 TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
2623 --- a/net/wireless/util.c
2624 +++ b/net/wireless/util.c
2625 @@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
2626 ev->dc.reason, true);
2628 case EVENT_IBSS_JOINED:
2629 - __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
2630 + __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
2635 @@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct
2637 mutex_lock_nested(&wdev_iter->mtx, 1);
2638 __acquire(wdev_iter->mtx);
2639 - cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
2640 + cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
2641 wdev_unlock(wdev_iter);
2644 --- a/net/wireless/chan.c
2645 +++ b/net/wireless/chan.c
2646 @@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct
2648 cfg80211_get_chan_state(struct wireless_dev *wdev,
2649 struct ieee80211_channel **chan,
2650 - enum cfg80211_chan_mode *chanmode)
2651 + enum cfg80211_chan_mode *chanmode,
2655 *chanmode = CHAN_MODE_UNDEFINED;
2656 @@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
2657 !wdev->ibss_dfs_possible)
2659 : CHAN_MODE_EXCLUSIVE;
2661 + /* consider worst-case - IBSS can try to return to the
2662 + * original user-specified channel as creator */
2663 + if (wdev->ibss_dfs_possible)
2664 + *radar_detect |= BIT(wdev->chandef.width);
2668 @@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
2669 case NL80211_IFTYPE_AP:
2670 case NL80211_IFTYPE_P2P_GO:
2671 if (wdev->cac_started) {
2672 - *chan = wdev->channel;
2673 + *chan = wdev->chandef.chan;
2674 *chanmode = CHAN_MODE_SHARED;
2675 + *radar_detect |= BIT(wdev->chandef.width);
2676 } else if (wdev->beacon_interval) {
2677 - *chan = wdev->channel;
2678 + *chan = wdev->chandef.chan;
2679 *chanmode = CHAN_MODE_SHARED;
2681 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2683 + *radar_detect |= BIT(wdev->chandef.width);
2686 case NL80211_IFTYPE_MESH_POINT:
2687 if (wdev->mesh_id_len) {
2688 - *chan = wdev->channel;
2689 + *chan = wdev->chandef.chan;
2690 *chanmode = CHAN_MODE_SHARED;
2692 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2694 + *radar_detect |= BIT(wdev->chandef.width);
2697 case NL80211_IFTYPE_MONITOR:
2698 --- a/net/wireless/mesh.c
2699 +++ b/net/wireless/mesh.c
2700 @@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
2702 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
2703 wdev->mesh_id_len = setup->mesh_id_len;
2704 - wdev->channel = setup->chandef.chan;
2705 + wdev->chandef = setup->chandef;
2709 @@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
2710 err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
2713 - wdev->channel = chandef->chan;
2714 + wdev->chandef = *chandef;
2718 @@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct
2719 err = rdev_leave_mesh(rdev, dev);
2721 wdev->mesh_id_len = 0;
2722 - wdev->channel = NULL;
2723 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2724 rdev_set_qos_map(rdev, dev, NULL);
2727 --- a/net/wireless/mlme.c
2728 +++ b/net/wireless/mlme.c
2729 @@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
2730 if (WARN_ON(!wdev->cac_started))
2733 - if (WARN_ON(!wdev->channel))
2734 + if (WARN_ON(!wdev->chandef.chan))
2738 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2739 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2740 @@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
2745 + if (is2GHz && !twiceMaxEdgePower)
2746 + twiceMaxEdgePower = 60;
2748 return twiceMaxEdgePower;
2751 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2752 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2754 #define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
2755 #define MAX_MAG_DELTA 11
2756 #define MAX_PHS_DELTA 10
2760 - int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2761 - int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2762 + int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2763 + int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2767 @@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2771 - iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
2772 + iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
2774 ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
2775 chain_idx, iqc_coeff[0]);
2776 @@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2780 - iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
2781 + iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
2783 ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
2784 chain_idx, iqc_coeff[1]);
2785 @@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
2789 -static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
2790 +static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
2794 int mp_max = -64, max_idx = 0;
2795 @@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
2797 /* find min/max mismatch across all calibrated gains */
2798 for (i = 0; i < nmeasurement; i++) {
2799 - if (mp_coeff[i] > mp_max) {
2800 - mp_max = mp_coeff[i];
2801 + if (mp_coeff[i][0] > mp_max) {
2802 + mp_max = mp_coeff[i][0];
2804 - } else if (mp_coeff[i] < mp_min) {
2805 - mp_min = mp_coeff[i];
2806 + } else if (mp_coeff[i][0] < mp_min) {
2807 + mp_min = mp_coeff[i][0];
2812 /* find average (exclude max abs value) */
2813 for (i = 0; i < nmeasurement; i++) {
2814 - if ((abs(mp_coeff[i]) < abs(mp_max)) ||
2815 - (abs(mp_coeff[i]) < abs(mp_min))) {
2816 - mp_avg += mp_coeff[i];
2817 + if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
2818 + (abs(mp_coeff[i][0]) < abs(mp_min))) {
2819 + mp_avg += mp_coeff[i][0];
2823 @@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
2827 - mp_avg = mp_coeff[nmeasurement - 1];
2828 + mp_avg = mp_coeff[nmeasurement - 1][0];
2830 /* detect outlier */
2831 if (abs(mp_max - mp_min) > max_delta) {
2832 @@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
2834 outlier_idx = min_idx;
2836 - mp_coeff[outlier_idx] = mp_avg;
2837 + mp_coeff[outlier_idx][0] = mp_avg;
2841 -static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
2842 - struct coeff *coeff,
2844 +static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
2845 + struct coeff *coeff,
2848 int i, im, nmeasurement;
2849 + int magnitude, phase;
2850 u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
2851 struct ath9k_hw_cal_data *caldata = ah->caldata;
2853 @@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
2854 if (nmeasurement > MAX_MEASUREMENT)
2855 nmeasurement = MAX_MEASUREMENT;
2857 - /* detect outlier only if nmeasurement > 1 */
2858 - if (nmeasurement > 1) {
2859 - /* Detect magnitude outlier */
2860 - ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2861 - nmeasurement, MAX_MAG_DELTA);
2863 - /* Detect phase outlier */
2864 - ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2865 - nmeasurement, MAX_PHS_DELTA);
2867 + * Skip normal outlier detection for AR9550.
2869 + if (!AR_SREV_9550(ah)) {
2870 + /* detect outlier only if nmeasurement > 1 */
2871 + if (nmeasurement > 1) {
2872 + /* Detect magnitude outlier */
2873 + ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2877 + /* Detect phase outlier */
2878 + ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2884 for (im = 0; im < nmeasurement; im++) {
2885 + magnitude = coeff->mag_coeff[i][im][0];
2886 + phase = coeff->phs_coeff[i][im][0];
2888 - coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
2889 - ((coeff->phs_coeff[i][im] & 0x7f) << 7);
2890 + coeff->iqc_coeff[0] =
2891 + (phase & 0x7f) | ((magnitude & 0x7f) << 7);
2894 REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
2895 @@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
2899 -static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
2900 +static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
2901 + struct coeff *coeff,
2902 + int i, int nmeasurement)
2904 + struct ath_common *common = ath9k_hw_common(ah);
2905 + int im, ix, iy, temp;
2907 + for (im = 0; im < nmeasurement; im++) {
2908 + for (ix = 0; ix < MAXIQCAL - 1; ix++) {
2909 + for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
2910 + if (coeff->mag_coeff[i][im][iy] <
2911 + coeff->mag_coeff[i][im][ix]) {
2912 + temp = coeff->mag_coeff[i][im][ix];
2913 + coeff->mag_coeff[i][im][ix] =
2914 + coeff->mag_coeff[i][im][iy];
2915 + coeff->mag_coeff[i][im][iy] = temp;
2917 + if (coeff->phs_coeff[i][im][iy] <
2918 + coeff->phs_coeff[i][im][ix]) {
2919 + temp = coeff->phs_coeff[i][im][ix];
2920 + coeff->phs_coeff[i][im][ix] =
2921 + coeff->phs_coeff[i][im][iy];
2922 + coeff->phs_coeff[i][im][iy] = temp;
2926 + coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
2927 + coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
2929 + ath_dbg(common, CALIBRATE,
2930 + "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
2932 + coeff->mag_coeff[i][im][0],
2933 + coeff->phs_coeff[i][im][0]);
2937 +static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
2938 + struct coeff *coeff,
2944 + if ((iqcal_idx + 1) != MAXIQCAL)
2947 + for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2948 + __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
2954 +static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
2958 struct ath_common *common = ath9k_hw_common(ah);
2959 const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
2960 @@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
2961 AR_PHY_CHAN_INFO_TAB_1,
2962 AR_PHY_CHAN_INFO_TAB_2,
2964 - struct coeff coeff;
2965 + static struct coeff coeff;
2969 + int nmeasurement = 0;
2970 + bool outlier_detect = true;
2972 for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2973 if (!(ah->txchainmask & (1 << i)))
2974 @@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
2978 - coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
2979 - coeff.phs_coeff[i][im] =
2980 + coeff.phs_coeff[i][im][iqcal_idx] =
2981 + coeff.iqc_coeff[0] & 0x7f;
2982 + coeff.mag_coeff[i][im][iqcal_idx] =
2983 (coeff.iqc_coeff[0] >> 7) & 0x7f;
2985 - if (coeff.mag_coeff[i][im] > 63)
2986 - coeff.mag_coeff[i][im] -= 128;
2987 - if (coeff.phs_coeff[i][im] > 63)
2988 - coeff.phs_coeff[i][im] -= 128;
2989 + if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
2990 + coeff.mag_coeff[i][im][iqcal_idx] -= 128;
2991 + if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
2992 + coeff.phs_coeff[i][im][iqcal_idx] -= 128;
2995 - ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
2997 + if (AR_SREV_9550(ah))
2998 + outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
2999 + iqcal_idx, nmeasurement);
3000 + if (outlier_detect)
3001 + ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
3005 @@ -1409,7 +1484,7 @@ skip_tx_iqcal:
3009 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
3010 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
3011 else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
3012 ar9003_hw_tx_iq_cal_reload(ah);
3014 @@ -1455,14 +1530,38 @@ skip_tx_iqcal:
3018 +static bool do_ar9003_agc_cal(struct ath_hw *ah)
3020 + struct ath_common *common = ath9k_hw_common(ah);
3023 + REG_WRITE(ah, AR_PHY_AGC_CONTROL,
3024 + REG_READ(ah, AR_PHY_AGC_CONTROL) |
3025 + AR_PHY_AGC_CONTROL_CAL);
3027 + status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
3028 + AR_PHY_AGC_CONTROL_CAL,
3029 + 0, AH_WAIT_TIMEOUT);
3031 + ath_dbg(common, CALIBRATE,
3032 + "offset calibration failed to complete in %d ms,"
3033 + "noisy environment?\n",
3034 + AH_WAIT_TIMEOUT / 1000);
3041 static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
3042 struct ath9k_channel *chan)
3044 struct ath_common *common = ath9k_hw_common(ah);
3045 struct ath9k_hw_cal_data *caldata = ah->caldata;
3046 bool txiqcal_done = false;
3047 - bool is_reusable = true, status = true;
3048 + bool status = true;
3049 bool run_agc_cal = false, sep_iq_cal = false;
3052 /* Use chip chainmask only for calibration */
3053 ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
3054 @@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
3055 * AGC calibration. Specifically, AR9550 in SoC chips.
3057 if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
3058 - txiqcal_done = true;
3059 + if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
3060 + AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
3061 + txiqcal_done = true;
3063 + txiqcal_done = false;
3068 @@ -1512,27 +1616,37 @@ skip_tx_iqcal:
3069 if (AR_SREV_9330_11(ah))
3070 ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
3072 - /* Calibrate the AGC */
3073 - REG_WRITE(ah, AR_PHY_AGC_CONTROL,
3074 - REG_READ(ah, AR_PHY_AGC_CONTROL) |
3075 - AR_PHY_AGC_CONTROL_CAL);
3077 - /* Poll for offset calibration complete */
3078 - status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
3079 - AR_PHY_AGC_CONTROL_CAL,
3080 - 0, AH_WAIT_TIMEOUT);
3083 + * For non-AR9550 chips, we just trigger AGC calibration
3084 + * in the HW, poll for completion and then process
3087 + * For AR955x, we run it multiple times and use
3088 + * median IQ correction.
3090 + if (!AR_SREV_9550(ah)) {
3091 + status = do_ar9003_agc_cal(ah);
3096 - ath_dbg(common, CALIBRATE,
3097 - "offset calibration failed to complete in %d ms; noisy environment?\n",
3098 - AH_WAIT_TIMEOUT / 1000);
3101 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
3103 + if (!txiqcal_done) {
3104 + status = do_ar9003_agc_cal(ah);
3108 + for (i = 0; i < MAXIQCAL; i++) {
3109 + status = do_ar9003_agc_cal(ah);
3112 + ar9003_hw_tx_iq_cal_post_proc(ah, i, false);
3119 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
3121 /* Revert chainmask to runtime parameters */
3122 ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
3124 --- a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3125 +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3130 +#include <linux/cache.h>
3132 #include "rtl818x.h"
3135 @@ -139,7 +141,10 @@ struct rtl8187_priv {
3142 + u8 dummy1[L1_CACHE_BYTES];
3143 + } ____cacheline_aligned;
3144 struct sk_buff_head queue;
3145 } b_tx_status; /* This queue is used by both -b and non-b devices */
3146 struct mutex io_mutex;
3147 @@ -147,7 +152,8 @@ struct rtl8187_priv {
3152 + u8 dummy2[L1_CACHE_BYTES];
3153 + } *io_dmabuf ____cacheline_aligned;
3157 --- a/net/mac80211/wme.c
3158 +++ b/net/mac80211/wme.c
3159 @@ -154,6 +154,11 @@ u16 ieee80211_select_queue(struct ieee80
3160 return IEEE80211_AC_BE;
3163 + if (skb->protocol == sdata->control_port_protocol) {
3164 + skb->priority = 7;
3165 + return ieee80211_downgrade_queue(sdata, skb);
3168 /* use the data classifier to determine what 802.1d tag the
3171 --- a/drivers/net/wireless/ath/ath9k/xmit.c
3172 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3173 @@ -1444,14 +1444,16 @@ void ath_tx_aggr_sleep(struct ieee80211_
3174 for (tidno = 0, tid = &an->tid[tidno];
3175 tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
3183 ath_txq_lock(sc, txq);
3185 + if (!tid->sched) {
3186 + ath_txq_unlock(sc, txq);
3190 buffered = ath_tid_has_buffered(tid);
3193 @@ -2184,14 +2186,15 @@ int ath_tx_start(struct ieee80211_hw *hw
3194 txq->stopped = true;
3198 + tid = ath_get_skb_tid(sc, txctl->an, skb);
3200 if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
3201 ath_txq_unlock(sc, txq);
3202 txq = sc->tx.uapsdq;
3203 ath_txq_lock(sc, txq);
3204 } else if (txctl->an &&
3205 ieee80211_is_data_present(hdr->frame_control)) {
3206 - tid = ath_get_skb_tid(sc, txctl->an, skb);
3208 WARN_ON(tid->ac->txq != txctl->txq);
3210 if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
3211 --- a/drivers/net/wireless/ath/ath9k/init.c
3212 +++ b/drivers/net/wireless/ath/ath9k/init.c
3213 @@ -943,6 +943,7 @@ static void ath9k_set_hw_capab(struct at
3214 hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
3215 hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
3216 hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
3217 + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
3221 --- a/net/mac80211/ieee80211_i.h
3222 +++ b/net/mac80211/ieee80211_i.h
3223 @@ -1700,14 +1700,8 @@ void ieee80211_stop_queue_by_reason(stru
3224 void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);
3225 void ieee80211_add_pending_skb(struct ieee80211_local *local,
3226 struct sk_buff *skb);
3227 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3228 - struct sk_buff_head *skbs,
3229 - void (*fn)(void *data), void *data);
3230 -static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3231 - struct sk_buff_head *skbs)
3233 - ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
3235 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3236 + struct sk_buff_head *skbs);
3237 void ieee80211_flush_queues(struct ieee80211_local *local,
3238 struct ieee80211_sub_if_data *sdata);
3240 --- a/net/mac80211/sta_info.c
3241 +++ b/net/mac80211/sta_info.c
3242 @@ -91,7 +91,7 @@ static int sta_info_hash_del(struct ieee
3246 -static void cleanup_single_sta(struct sta_info *sta)
3247 +static void __cleanup_single_sta(struct sta_info *sta)
3250 struct tid_ampdu_tx *tid_tx;
3251 @@ -99,7 +99,8 @@ static void cleanup_single_sta(struct st
3252 struct ieee80211_local *local = sdata->local;
3255 - if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
3256 + if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
3257 + test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
3258 if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
3259 sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
3260 ps = &sdata->bss->ps;
3261 @@ -109,6 +110,7 @@ static void cleanup_single_sta(struct st
3264 clear_sta_flag(sta, WLAN_STA_PS_STA);
3265 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3267 atomic_dec(&ps->num_sta_ps);
3268 sta_info_recalc_tim(sta);
3269 @@ -139,7 +141,14 @@ static void cleanup_single_sta(struct st
3270 ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
3275 +static void cleanup_single_sta(struct sta_info *sta)
3277 + struct ieee80211_sub_if_data *sdata = sta->sdata;
3278 + struct ieee80211_local *local = sdata->local;
3280 + __cleanup_single_sta(sta);
3281 sta_info_free(local, sta);
3284 @@ -330,6 +339,7 @@ struct sta_info *sta_info_alloc(struct i
3287 spin_lock_init(&sta->lock);
3288 + spin_lock_init(&sta->ps_lock);
3289 INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
3290 INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
3291 mutex_init(&sta->ampdu_mlme.mtx);
3292 @@ -487,21 +497,26 @@ static int sta_info_insert_finish(struct
3296 - /* notify driver */
3297 - err = sta_info_insert_drv_state(local, sdata, sta);
3302 local->sta_generation++;
3305 + /* simplify things and don't accept BA sessions yet */
3306 + set_sta_flag(sta, WLAN_STA_BLOCK_BA);
3308 /* make the station visible */
3309 sta_info_hash_add(local, sta);
3311 list_add_rcu(&sta->list, &local->sta_list);
3313 + /* notify driver */
3314 + err = sta_info_insert_drv_state(local, sdata, sta);
3318 set_sta_flag(sta, WLAN_STA_INSERTED);
3319 + /* accept BA sessions now */
3320 + clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
3322 ieee80211_recalc_min_chandef(sdata);
3323 ieee80211_sta_debugfs_add(sta);
3324 @@ -522,6 +537,12 @@ static int sta_info_insert_finish(struct
3325 mesh_accept_plinks_update(sdata);
3329 + sta_info_hash_del(local, sta);
3330 + list_del_rcu(&sta->list);
3332 + synchronize_net();
3333 + __cleanup_single_sta(sta);
3335 mutex_unlock(&local->sta_mtx);
3337 @@ -1071,10 +1092,14 @@ struct ieee80211_sta *ieee80211_find_sta
3339 EXPORT_SYMBOL(ieee80211_find_sta);
3341 -static void clear_sta_ps_flags(void *_sta)
3342 +/* powersave support code */
3343 +void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3345 - struct sta_info *sta = _sta;
3346 struct ieee80211_sub_if_data *sdata = sta->sdata;
3347 + struct ieee80211_local *local = sdata->local;
3348 + struct sk_buff_head pending;
3349 + int filtered = 0, buffered = 0, ac;
3350 + unsigned long flags;
3353 if (sdata->vif.type == NL80211_IFTYPE_AP ||
3354 @@ -1085,20 +1110,6 @@ static void clear_sta_ps_flags(void *_st
3358 - clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3359 - if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
3360 - atomic_dec(&ps->num_sta_ps);
3363 -/* powersave support code */
3364 -void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3366 - struct ieee80211_sub_if_data *sdata = sta->sdata;
3367 - struct ieee80211_local *local = sdata->local;
3368 - struct sk_buff_head pending;
3369 - int filtered = 0, buffered = 0, ac;
3370 - unsigned long flags;
3372 clear_sta_flag(sta, WLAN_STA_SP);
3374 BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
3375 @@ -1109,6 +1120,8 @@ void ieee80211_sta_ps_deliver_wakeup(str
3377 skb_queue_head_init(&pending);
3379 + /* sync with ieee80211_tx_h_unicast_ps_buf */
3380 + spin_lock(&sta->ps_lock);
3381 /* Send all buffered frames to the station */
3382 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
3383 int count = skb_queue_len(&pending), tmp;
3384 @@ -1127,7 +1140,12 @@ void ieee80211_sta_ps_deliver_wakeup(str
3385 buffered += tmp - count;
3388 - ieee80211_add_pending_skbs_fn(local, &pending, clear_sta_ps_flags, sta);
3389 + ieee80211_add_pending_skbs(local, &pending);
3390 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3391 + clear_sta_flag(sta, WLAN_STA_PS_STA);
3392 + spin_unlock(&sta->ps_lock);
3394 + atomic_dec(&ps->num_sta_ps);
3396 /* This station just woke up and isn't aware of our SMPS state */
3397 if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,
3398 --- a/net/mac80211/sta_info.h
3399 +++ b/net/mac80211/sta_info.h
3400 @@ -267,6 +267,7 @@ struct ieee80211_tx_latency_stat {
3401 * @drv_unblock_wk: used for driver PS unblocking
3402 * @listen_interval: listen interval of this station, when we're acting as AP
3403 * @_flags: STA flags, see &enum ieee80211_sta_info_flags, do not use directly
3404 + * @ps_lock: used for powersave (when mac80211 is the AP) related locking
3405 * @ps_tx_buf: buffers (per AC) of frames to transmit to this station
3406 * when it leaves power saving state or polls
3407 * @tx_filtered: buffers (per AC) of frames we already tried to
3408 @@ -356,10 +357,8 @@ struct sta_info {
3409 /* use the accessors defined below */
3410 unsigned long _flags;
3413 - * STA powersave frame queues, no more than the internal
3414 - * locking required.
3416 + /* STA powersave lock and frame queues */
3417 + spinlock_t ps_lock;
3418 struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
3419 struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
3420 unsigned long driver_buffered_tids;
3421 --- a/net/mac80211/util.c
3422 +++ b/net/mac80211/util.c
3423 @@ -435,9 +435,8 @@ void ieee80211_add_pending_skb(struct ie
3424 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
3427 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3428 - struct sk_buff_head *skbs,
3429 - void (*fn)(void *data), void *data)
3430 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3431 + struct sk_buff_head *skbs)
3433 struct ieee80211_hw *hw = &local->hw;
3434 struct sk_buff *skb;
3435 @@ -461,9 +460,6 @@ void ieee80211_add_pending_skbs_fn(struc
3436 __skb_queue_tail(&local->pending[queue], skb);
3442 for (i = 0; i < hw->queues; i++)
3443 __ieee80211_wake_queue(hw, i,
3444 IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
3445 --- a/net/wireless/reg.c
3446 +++ b/net/wireless/reg.c
3447 @@ -1700,7 +1700,7 @@ static void reg_process_hint(struct regu
3449 case NL80211_REGDOM_SET_BY_USER:
3450 treatment = reg_process_hint_user(reg_request);
3451 - if (treatment == REG_REQ_OK ||
3452 + if (treatment == REG_REQ_IGNORE ||
3453 treatment == REG_REQ_ALREADY_SET)
3455 schedule_delayed_work(®_timeout, msecs_to_jiffies(3142));
3456 --- a/drivers/net/wireless/ath/ath9k/debug.c
3457 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3458 @@ -866,6 +866,12 @@ static ssize_t read_file_reset(struct fi
3459 "%17s: %2d\n", "PLL RX Hang",
3460 sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
3461 len += scnprintf(buf + len, sizeof(buf) - len,
3462 + "%17s: %2d\n", "MAC Hang",
3463 + sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
3464 + len += scnprintf(buf + len, sizeof(buf) - len,
3465 + "%17s: %2d\n", "Stuck Beacon",
3466 + sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
3467 + len += scnprintf(buf + len, sizeof(buf) - len,
3468 "%17s: %2d\n", "MCI Reset",
3469 sc->debug.stats.reset[RESET_TYPE_MCI]);
3471 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3472 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3473 @@ -868,10 +868,6 @@ static void ar9003_hw_set_rfmode(struct
3475 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
3476 rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
3477 - if (IS_CHAN_QUARTER_RATE(chan))
3478 - rfMode |= AR_PHY_MODE_QUARTER;
3479 - if (IS_CHAN_HALF_RATE(chan))
3480 - rfMode |= AR_PHY_MODE_HALF;
3482 if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
3483 REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
3484 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
3485 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
3486 @@ -706,6 +706,7 @@ ath5k_get_survey(struct ieee80211_hw *hw
3487 survey->channel = conf->chandef.chan;
3488 survey->noise = ah->ah_noise_floor;
3489 survey->filled = SURVEY_INFO_NOISE_DBM |
3490 + SURVEY_INFO_IN_USE |
3491 SURVEY_INFO_CHANNEL_TIME |
3492 SURVEY_INFO_CHANNEL_TIME_BUSY |
3493 SURVEY_INFO_CHANNEL_TIME_RX |
3494 --- a/drivers/net/wireless/ath/ath9k/recv.c
3495 +++ b/drivers/net/wireless/ath/ath9k/recv.c
3496 @@ -732,11 +732,18 @@ static struct ath_rxbuf *ath_get_next_rx
3500 - * mark descriptor as zero-length and set the 'more'
3501 - * flag to ensure that both buffers get discarded
3502 + * Re-check previous descriptor, in case it has been filled
3503 + * in the mean time.
3505 - rs->rs_datalen = 0;
3506 - rs->rs_more = true;
3507 + ret = ath9k_hw_rxprocdesc(ah, ds, rs);
3508 + if (ret == -EINPROGRESS) {
3510 + * mark descriptor as zero-length and set the 'more'
3511 + * flag to ensure that both buffers get discarded
3513 + rs->rs_datalen = 0;
3514 + rs->rs_more = true;
3518 list_del(&bf->list);
3519 @@ -985,32 +992,32 @@ static int ath9k_rx_skb_preprocess(struc
3520 struct ath_common *common = ath9k_hw_common(ah);
3521 struct ieee80211_hdr *hdr;
3522 bool discard_current = sc->rx.discard_next;
3526 * Discard corrupt descriptors which are marked in
3527 * ath_get_next_rx_buf().
3529 - sc->rx.discard_next = rx_stats->rs_more;
3530 if (discard_current)
3534 + sc->rx.discard_next = false;
3537 * Discard zero-length packets.
3539 if (!rx_stats->rs_datalen) {
3540 RX_STAT_INC(rx_len_err);
3546 - * rs_status follows rs_datalen so if rs_datalen is too large
3547 - * we can take a hint that hardware corrupted it, so ignore
3551 + * rs_status follows rs_datalen so if rs_datalen is too large
3552 + * we can take a hint that hardware corrupted it, so ignore
3555 if (rx_stats->rs_datalen > (common->rx_bufsize - ah->caps.rx_status_len)) {
3556 RX_STAT_INC(rx_len_err);
3561 /* Only use status info from the last fragment */
3562 @@ -1024,10 +1031,8 @@ static int ath9k_rx_skb_preprocess(struc
3563 * This is different from the other corrupt descriptor
3564 * condition handled above.
3566 - if (rx_stats->rs_status & ATH9K_RXERR_CORRUPT_DESC) {
3570 + if (rx_stats->rs_status & ATH9K_RXERR_CORRUPT_DESC)
3573 hdr = (struct ieee80211_hdr *) (skb->data + ah->caps.rx_status_len);
3575 @@ -1043,18 +1048,15 @@ static int ath9k_rx_skb_preprocess(struc
3576 if (ath_process_fft(sc, hdr, rx_stats, rx_status->mactime))
3577 RX_STAT_INC(rx_spectral);
3585 * everything but the rate is checked here, the rate check is done
3586 * separately to avoid doing two lookups for a rate for each frame.
3588 - if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error)) {
3592 + if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
3595 if (ath_is_mybeacon(common, hdr)) {
3596 RX_STAT_INC(rx_beacons);
3597 @@ -1064,15 +1066,11 @@ static int ath9k_rx_skb_preprocess(struc
3599 * This shouldn't happen, but have a safety check anyway.
3601 - if (WARN_ON(!ah->curchan)) {
3605 + if (WARN_ON(!ah->curchan))
3608 - if (ath9k_process_rate(common, hw, rx_stats, rx_status)) {
3612 + if (ath9k_process_rate(common, hw, rx_stats, rx_status))
3615 ath9k_process_rssi(common, hw, rx_stats, rx_status);
3617 @@ -1087,9 +1085,11 @@ static int ath9k_rx_skb_preprocess(struc
3622 - sc->rx.discard_next = false;
3627 + sc->rx.discard_next = rx_stats->rs_more;
3631 static void ath9k_rx_skb_postprocess(struct ath_common *common,
3632 --- a/drivers/net/wireless/ath/ath9k/ani.c
3633 +++ b/drivers/net/wireless/ath/ath9k/ani.c
3634 @@ -176,16 +176,26 @@ static void ath9k_hw_set_ofdm_nil(struct
3635 if (ah->opmode == NL80211_IFTYPE_STATION &&
3636 BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_HIGH)
3640 - * OFDM Weak signal detection is always enabled for AP mode.
3641 + * Newer chipsets are better at dealing with high PHY error counts -
3642 + * keep weak signal detection enabled when no RSSI threshold is
3643 + * available to determine if it is needed (mode != STA)
3645 - if (ah->opmode != NL80211_IFTYPE_AP &&
3646 - aniState->ofdmWeakSigDetect != weak_sig) {
3647 - ath9k_hw_ani_control(ah,
3648 - ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
3649 - entry_ofdm->ofdm_weak_signal_on);
3651 + else if (AR_SREV_9300_20_OR_LATER(ah) &&
3652 + ah->opmode != NL80211_IFTYPE_STATION)
3655 + /* Older chipsets are more sensitive to high PHY error counts */
3656 + else if (!AR_SREV_9300_20_OR_LATER(ah) &&
3657 + aniState->ofdmNoiseImmunityLevel >= 8)
3660 + if (aniState->ofdmWeakSigDetect != weak_sig)
3661 + ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
3664 + if (!AR_SREV_9300_20_OR_LATER(ah))
3667 if (aniState->ofdmNoiseImmunityLevel >= ATH9K_ANI_OFDM_DEF_LEVEL) {
3668 ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3669 @@ -483,10 +493,17 @@ void ath9k_hw_ani_init(struct ath_hw *ah
3671 ath_dbg(common, ANI, "Initialize ANI\n");
3673 - ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3674 - ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
3675 - ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
3676 - ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
3677 + if (AR_SREV_9300_20_OR_LATER(ah)) {
3678 + ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3679 + ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
3680 + ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
3681 + ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
3683 + ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
3684 + ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
3685 + ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
3686 + ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_OLD;
3689 ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
3690 ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
3691 --- a/drivers/net/wireless/ath/ath9k/ani.h
3692 +++ b/drivers/net/wireless/ath/ath9k/ani.h
3694 /* units are errors per second */
3695 #define ATH9K_ANI_OFDM_TRIG_HIGH 3500
3696 #define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
3697 +#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD 500
3699 #define ATH9K_ANI_OFDM_TRIG_LOW 400
3700 #define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
3701 +#define ATH9K_ANI_OFDM_TRIG_LOW_OLD 200
3703 #define ATH9K_ANI_CCK_TRIG_HIGH 600
3704 +#define ATH9K_ANI_CCK_TRIG_HIGH_OLD 200
3705 #define ATH9K_ANI_CCK_TRIG_LOW 300
3706 +#define ATH9K_ANI_CCK_TRIG_LOW_OLD 100
3708 #define ATH9K_ANI_SPUR_IMMUNE_LVL 3
3709 #define ATH9K_ANI_FIRSTEP_LVL 2
projects / openwrt.git / blob