1 commit ee41f72476e1ea44283dfe1cbf75b9543a1e15c8
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Sat Feb 22 14:44:52 2014 +0100
5 ath9k: make some hardware reset log messages debug-only
7 On some chips, baseband watchdog hangs are more common than others, and
8 the driver has support for handling them.
9 Interrupts even after a watchdog hang are also quite common, so there's
10 not much point in spamming the user's logfiles.
12 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
14 commit b14fbb554fc65a2e0b5c41a319269b0350f187e7
15 Author: Felix Fietkau <nbd@openwrt.org>
16 Date: Sat Feb 22 14:35:25 2014 +0100
18 ath9k: do not set half/quarter channel flags in AR_PHY_MODE
20 5/10 MHz channel bandwidth is configured via the PLL clock, instead of
21 the AR_PHY_MODE register. Using that register is AR93xx specific, and
22 makes the mode incompatible with earlier chipsets.
24 In some early versions, these flags were apparently applied at the wrong
25 point in time and thus did not cause connectivity issues, however now
26 they are causing problems, as pointed out in this OpenWrt ticket:
28 https://dev.openwrt.org/ticket/14916
30 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
32 commit 0f1cb7be2551b30b02cd54c897e0e29e483cfda5
33 Author: Felix Fietkau <nbd@openwrt.org>
34 Date: Sat Feb 22 13:43:29 2014 +0100
36 ath9k: fix ps-poll responses under a-mpdu sessions
38 When passing tx frames to the U-APSD queue for powersave poll responses,
39 the ath_atx_tid pointer needs to be passed to ath_tx_setup_buffer for
40 proper sequence number accounting.
42 This fixes high latency and connection stability issues with ath9k
43 running as AP and a few kinds of mobile phones as client, when PS-Poll
46 Cc: stable@vger.kernel.org
47 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
49 commit d5d87a37bbd6066b2c3c5d0bd0fe2a6e2ea45cc5
50 Author: Felix Fietkau <nbd@openwrt.org>
51 Date: Fri Feb 21 11:39:59 2014 +0100
53 ath9k: list more reset causes in debugfs
55 Number of MAC hangs and stuck beacons were missing
57 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
59 commit d84856012e0f10fe598a5ad3b7b869397a089e07
60 Author: Johannes Berg <johannes.berg@intel.com>
61 Date: Thu Feb 20 11:19:58 2014 +0100
63 mac80211: fix station wakeup powersave race
65 Consider the following (relatively unlikely) scenario:
66 1) station goes to sleep while frames are buffered in driver
67 2) driver blocks wakeup (until no more frames are buffered)
68 3) station wakes up again
69 4) driver unblocks wakeup
71 In this case, the current mac80211 code will do the following:
72 1) WLAN_STA_PS_STA set
73 2) WLAN_STA_PS_DRIVER set
75 4) WLAN_STA_PS_DRIVER cleared
77 As a result, no frames will be delivered to the client, even
78 though it is awake, until it sends another frame to us that
79 triggers ieee80211_sta_ps_deliver_wakeup() in sta_ps_end().
81 Since we now take the PS spinlock, we can fix this while at
82 the same time removing the complexity with the pending skb
83 queue function. This was broken since my commit 50a9432daeec
84 ("mac80211: fix powersaving clients races") due to removing
85 the clearing of WLAN_STA_PS_STA in the RX path.
87 While at it, fix a cleanup path issue when a station is
88 removed while the driver is still blocking its wakeup.
90 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
92 commit 798f2786602cbe93e6b928299614aa36ebf50692
93 Author: Johannes Berg <johannes.berg@intel.com>
94 Date: Mon Feb 17 20:49:03 2014 +0100
96 mac80211: insert stations before adding to driver
98 There's a race condition in mac80211 because we add stations
99 to the internal lists after adding them to the driver, which
100 means that (for example) the following can happen:
101 1. a station connects and is added
102 2. first, it is added to the driver
103 3. then, it is added to the mac80211 lists
105 If the station goes to sleep between steps 2 and 3, and the
106 firmware/hardware records it as being asleep, mac80211 will
107 never instruct the driver to wake it up again as it never
108 realized it went to sleep since the RX path discarded the
109 frame as a "spurious class 3 frame", no station entry was
112 Fix this by adding the station in software first, and only
113 then adding it to the driver. That way, any state that the
114 driver changes will be reflected properly in mac80211's
115 station state. The problematic part is the roll-back if the
116 driver fails to add the station, in that case a bit more is
117 needed. To not make that overly complex prevent starting BA
118 sessions in the meantime.
120 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
122 commit b9ba6a520cb07ab3aa7aaaf9ce4a0bc7a6bc06fe
123 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
124 Date: Thu Feb 20 09:22:11 2014 +0200
126 mac80211: fix AP powersave TX vs. wakeup race
128 There is a race between the TX path and the STA wakeup: while
129 a station is sleeping, mac80211 buffers frames until it wakes
130 up, then the frames are transmitted. However, the RX and TX
131 path are concurrent, so the packet indicating wakeup can be
132 processed while a packet is being transmitted.
134 This can lead to a situation where the buffered frames list
135 is emptied on the one side, while a frame is being added on
136 the other side, as the station is still seen as sleeping in
139 As a result, the newly added frame will not be send anytime
140 soon. It might be sent much later (and out of order) when the
141 station goes to sleep and wakes up the next time.
143 Additionally, it can lead to the crash below.
145 Fix all this by synchronising both paths with a new lock.
146 Both path are not fastpath since they handle PS situations.
148 In a later patch we'll remove the extra skb queue locks to
149 reduce locking overhead.
151 BUG: unable to handle kernel
152 NULL pointer dereference at 000000b0
153 IP: [<ff6f1791>] ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
155 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
156 EIP: 0060:[<ff6f1791>] EFLAGS: 00210282 CPU: 1
157 EIP is at ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
158 EAX: e5900da0 EBX: 00000000 ECX: 00000001 EDX: 00000000
159 ESI: e41d00c0 EDI: e5900da0 EBP: ebe458e4 ESP: ebe458b0
160 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
161 CR0: 8005003b CR2: 000000b0 CR3: 25a78000 CR4: 000407d0
162 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
163 DR6: ffff0ff0 DR7: 00000400
164 Process iperf (pid: 3934, ti=ebe44000 task=e757c0b0 task.ti=ebe44000)
165 iwlwifi 0000:02:00.0: I iwl_pcie_enqueue_hcmd Sending command LQ_CMD (#4e), seq: 0x0903, 92 bytes at 3[3]:9
167 e403b32c ebe458c4 00200002 00200286 e403b338 ebe458cc c10960bb e5900da0
168 ff76a6ec ebe458d8 00000000 e41d00c0 e5900da0 ebe458f0 ff6f1b75 e403b210
169 ebe4598c ff723dc1 00000000 ff76a6ec e597c978 e403b758 00000002 00000002
171 [<ff6f1b75>] ieee80211_free_txskb+0x15/0x20 [mac80211]
172 [<ff723dc1>] invoke_tx_handlers+0x1661/0x1780 [mac80211]
173 [<ff7248a5>] ieee80211_tx+0x75/0x100 [mac80211]
174 [<ff7249bf>] ieee80211_xmit+0x8f/0xc0 [mac80211]
175 [<ff72550e>] ieee80211_subif_start_xmit+0x4fe/0xe20 [mac80211]
176 [<c149ef70>] dev_hard_start_xmit+0x450/0x950
177 [<c14b9aa9>] sch_direct_xmit+0xa9/0x250
178 [<c14b9c9b>] __qdisc_run+0x4b/0x150
179 [<c149f732>] dev_queue_xmit+0x2c2/0xca0
181 Cc: stable@vger.kernel.org
182 Reported-by: Yaara Rozenblum <yaara.rozenblum@intel.com>
183 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
184 Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
185 [reword commit log, use a separate lock]
186 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
188 commit 80e419de0dff38436b30d363311c625766193f86
189 Author: Inbal Hacohen <Inbal.Hacohen@intel.com>
190 Date: Wed Feb 12 09:32:27 2014 +0200
192 cfg80211: bugfix in regulatory user hint process
194 After processing hint_user, we would want to schedule the
195 timeout work only if we are actually waiting to CRDA. This happens
196 when the status is not "IGNORE" nor "ALREADY_SET".
198 Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
199 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
201 commit 6514c93afede55284e2cb63359aadedb85884c80
202 Author: Jouni Malinen <jouni@qca.qualcomm.com>
203 Date: Tue Feb 18 20:41:08 2014 +0200
205 ath9k: Enable U-APSD AP mode support
207 mac80211 handles the actual operations, so ath9k can just indicate
208 support for this. Based on initial tests, this combination seems to
211 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
213 commit a63caf0a357ad5c1f08d6b7827dc76c451445017
214 Author: Stanislaw Gruszka <sgruszka@redhat.com>
215 Date: Wed Feb 19 13:15:17 2014 +0100
217 ath9k: protect tid->sched check
219 We check tid->sched without a lock taken on ath_tx_aggr_sleep(). That
220 is race condition which can result of doing list_del(&tid->list) twice
221 (second time with poisoned list node) and cause crash like shown below:
223 [424271.637220] BUG: unable to handle kernel paging request at 00100104
224 [424271.637328] IP: [<f90fc072>] ath_tx_aggr_sleep+0x62/0xe0 [ath9k]
226 [424271.639953] Call Trace:
227 [424271.639998] [<f90f6900>] ? ath9k_get_survey+0x110/0x110 [ath9k]
228 [424271.640083] [<f90f6942>] ath9k_sta_notify+0x42/0x50 [ath9k]
229 [424271.640177] [<f809cfef>] sta_ps_start+0x8f/0x1c0 [mac80211]
230 [424271.640258] [<c10f730e>] ? free_compound_page+0x2e/0x40
231 [424271.640346] [<f809e915>] ieee80211_rx_handlers+0x9d5/0x2340 [mac80211]
232 [424271.640437] [<c112f048>] ? kmem_cache_free+0x1d8/0x1f0
233 [424271.640510] [<c1345a84>] ? kfree_skbmem+0x34/0x90
234 [424271.640578] [<c10fc23c>] ? put_page+0x2c/0x40
235 [424271.640640] [<c1345a84>] ? kfree_skbmem+0x34/0x90
236 [424271.640706] [<c1345a84>] ? kfree_skbmem+0x34/0x90
237 [424271.640787] [<f809dde3>] ? ieee80211_rx_handlers_result+0x73/0x1d0 [mac80211]
238 [424271.640897] [<f80a07a0>] ieee80211_prepare_and_rx_handle+0x520/0xad0 [mac80211]
239 [424271.641009] [<f809e22d>] ? ieee80211_rx_handlers+0x2ed/0x2340 [mac80211]
240 [424271.641104] [<c13846ce>] ? ip_output+0x7e/0xd0
241 [424271.641182] [<f80a1057>] ieee80211_rx+0x307/0x7c0 [mac80211]
242 [424271.641266] [<f90fa6ee>] ath_rx_tasklet+0x88e/0xf70 [ath9k]
243 [424271.641358] [<f80a0f2c>] ? ieee80211_rx+0x1dc/0x7c0 [mac80211]
244 [424271.641445] [<f90f82db>] ath9k_tasklet+0xcb/0x130 [ath9k]
247 https://bugzilla.kernel.org/show_bug.cgi?id=70551
249 Reported-and-tested-by: Max Sydorenko <maxim.stargazer@gmail.com>
250 Cc: stable@vger.kernel.org
251 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
253 commit 82ed9e3ccc02797df2ffe4b78127c4cd5f799a41
254 Author: Felix Fietkau <nbd@openwrt.org>
255 Date: Tue Feb 11 15:54:13 2014 +0100
257 mac80211: send control port protocol frames to the VO queue
259 Improves reliability of wifi connections with WPA, since authentication
260 frames are prioritized over normal traffic and also typically exempt
263 Cc: stable@vger.kernel.org
264 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
266 commit d4426800f71e972feaa33e04c5801fc730627bdd
267 Author: Stanislaw Gruszka <stf_xl@wp.pl>
268 Date: Mon Feb 10 22:38:28 2014 +0100
270 rtl8187: fix regression on MIPS without coherent DMA
272 This patch fixes regression caused by commit a16dad77634 "MIPS: Fix
273 potencial corruption". That commit fixes one corruption scenario in
274 cost of adding another one, which actually start to cause crashes
275 on Yeeloong laptop when rtl8187 driver is used.
277 For correct DMA read operation on machines without DMA coherence, kernel
278 have to invalidate cache, such it will refill later with new data that
279 device wrote to memory, when that data is needed to process. We can only
280 invalidate full cache line. Hence when cache line includes both dma
281 buffer and some other data (written in cache, but not yet in main
282 memory), the other data can not hit memory due to invalidation. That
283 happen on rtl8187 where struct rtl8187_priv fields are located just
284 before and after small buffers that are passed to USB layer and DMA
285 is performed on them.
287 To fix the problem we align buffers and reserve space after them to make
288 them match cache line.
290 This patch does not resolve all possible MIPS problems entirely, for
291 that we have to assure that we always map cache aligned buffers for DMA,
292 what can be complex or even not possible. But patch fixes visible and
293 reproducible regression and seems other possible corruptions do not
294 happen in practice, since Yeeloong laptop works stable without rtl8187
298 https://bugzilla.kernel.org/show_bug.cgi?id=54391
300 Reported-by: Petr Pisar <petr.pisar@atlas.cz>
301 Bisected-by: Tom Li <biergaizi2009@gmail.com>
302 Reported-and-tested-by: Tom Li <biergaizi2009@gmail.com>
303 Cc: stable@vger.kernel.org
304 Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
306 commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
307 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
308 Date: Fri Feb 7 10:29:55 2014 +0530
310 ath9k: Calculate IQ-CAL median
312 This patch adds a routine to calculate the median IQ correction
313 values for AR955x, which is used for outlier detection.
314 The normal method which is used for all other chips is
317 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
319 commit c52a6fce0820c8d0687443ab86058ae03b478c8f
320 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
321 Date: Fri Feb 7 10:29:54 2014 +0530
323 ath9k: Expand the IQ coefficient array
325 This will be used for storing data for mutiple
326 IQ calibration runs, for AR955x.
328 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
330 commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
331 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
332 Date: Fri Feb 7 10:29:53 2014 +0530
334 ath9k: Modify IQ calibration for AR955x
336 IQ calibration post-processing for AR955x is different
337 from other chips - instead of just doing it as part
338 of AGC calibration once, it is triggered 3 times and
339 a median is determined. This patch adds initial support
340 for changing the calibration behavior for AR955x.
342 Also, to simplify things, a helper routine to issue/poll
343 AGC calibration is used.
345 For non-AR955x chips, the iqcal_idx (which will be used
346 in subsequent patches) is set to zero.
348 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
350 commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
351 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
352 Date: Fri Feb 7 10:29:52 2014 +0530
354 ath9k: Fix magnitude/phase calculation
356 Incorrect values are programmed in the registers
357 containing the IQ correction coefficients by the IQ-CAL
358 post-processing code. Fix this.
360 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
362 commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
363 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
364 Date: Fri Feb 7 10:29:51 2014 +0530
366 ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
368 Use ar9003_hw_tx_iq_cal_outlier_detection instead.
370 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
372 commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
373 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
374 Date: Fri Feb 7 10:29:50 2014 +0530
376 ath9k: Check explicitly for IQ calibration
378 In chips like AR955x, the initvals contain the information
379 whether IQ calibration is to be done in the HW when an
380 AGC calibration is triggered. Check if IQ-CAL is enabled
381 in the initvals before flagging 'txiqcal_done' as true.
383 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
385 commit cb4969634b93c4643a32cc3fbd27d2b288b25771
386 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
387 Date: Fri Feb 7 10:29:49 2014 +0530
389 ath9k: Fix IQ cal post processing for SoC
391 Calibration data is not reused for SoC chips, so
392 call ar9003_hw_tx_iq_cal_post_proc() with the correct
393 argument. The 'is_reusable' flag is currently used
394 only for PC-OEM chips, but it makes things clearer to
395 specify it explicity.
397 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
399 commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
400 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
401 Date: Mon Feb 3 13:31:37 2014 +0530
403 ath9k: Fix TX power calculation
405 The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
406 fixed the incorrect values in the eeprom templates, but if
407 boards have already been calibrated with incorrect values,
408 they would still be using the wrong TX power. Fix this by assigning
409 a default value in such cases.
411 Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
412 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
414 commit b9f268b5b01331c3c82179abca551429450e9417
415 Author: Michal Kazior <michal.kazior@tieto.com>
416 Date: Wed Jan 29 14:22:27 2014 +0100
418 cfg80211: consider existing DFS interfaces
420 It was possible to break interface combinations in
423 combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
424 combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
426 With the above interface combinations it was
429 step 1. start AP on DFS channel by matching combo 2
430 step 2. start AP on non-DFS channel by matching combo 1
432 This was possible beacuse (step 2) did not consider
433 if other interfaces require radar detection.
435 The patch changes how cfg80211 tracks channels -
436 instead of channel itself now a complete chandef
439 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
440 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
442 commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
443 Author: Antonio Quartulli <antonio@open-mesh.com>
444 Date: Wed Jan 29 17:53:43 2014 +0100
446 cfg80211: fix channel configuration in IBSS join
448 When receiving an IBSS_JOINED event select the BSS object
449 based on the {bssid, channel} couple rather than the bssid
451 With the current approach if another cell having the same
452 BSSID (but using a different channel) exists then cfg80211
453 picks up the wrong BSS object.
454 The result is a mismatching channel configuration between
455 cfg80211 and the driver, that can lead to any sort of
458 The issue can be triggered by having an IBSS sitting on
459 given channel and then asking the driver to create a new
460 cell using the same BSSID but with a different frequency.
461 By passing the channel to cfg80211_get_bss() we can solve
462 this ambiguity and retrieve/create the correct BSS object.
463 All the users of cfg80211_ibss_joined() have been changed
466 Moreover WARN when cfg80211_ibss_joined() gets a NULL
467 channel as argument and remove a bogus call of the same
468 function in ath6kl (it does not make sense to call
469 cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
471 Cc: Kalle Valo <kvalo@qca.qualcomm.com>
472 Cc: Arend van Spriel <arend@broadcom.com>
473 Cc: Bing Zhao <bzhao@marvell.com>
474 Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
475 Cc: libertas-dev@lists.infradead.org
476 Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
477 Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
478 [minor code cleanup in ath6kl]
479 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
481 commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
482 Author: Johannes Berg <johannes.berg@intel.com>
483 Date: Fri Jan 24 14:41:44 2014 +0100
485 mac80211: fix bufferable MMPDU RX handling
487 Action, disassoc and deauth frames are bufferable, and as such don't
488 have the PM bit in the frame control field reserved which means we
489 need to react to the bit when receiving in such a frame.
491 Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
492 and using it for the RX path that currently ignores the PM bit in
493 any non-data frames for doze->wake transitions, but listens to it in
494 all frames for wake->doze transitions, both of which are wrong.
496 Also use the new helper in the TX path to clean up the code.
498 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
500 commit fc0df6d2343636e3f48a069330d5b972e3d8659d
501 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
502 Date: Fri Jan 24 14:29:21 2014 +0100
504 cfg80211: set preset_chandef after channel switch
506 Set preset_chandef in channel switch notification.
507 In other case we will have old preset_chandef.
509 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
510 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
512 commit cdec895e2344987ff171cece96e25d7407a3ebf6
513 Author: Simon Wunderlich <simon@open-mesh.com>
514 Date: Fri Jan 24 23:48:29 2014 +0100
516 mac80211: send ibss probe responses with noack flag
518 Responding to probe requests for scanning clients will often create
519 excessive retries, as it happens quite often that the scanning client
520 already left the channel. Therefore do it like hostapd and send probe
521 responses for wildcard SSID only once by using the noack flag.
523 Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
524 [fix typo & 'wildcard SSID' in commit log]
525 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
527 commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
528 Author: Luciano Coelho <luciano.coelho@intel.com>
529 Date: Tue Jan 28 17:09:08 2014 +0200
531 mac80211: ibss: remove unnecessary call to release channel
533 The ieee80211_vif_use_channel() function calls
534 ieee80211_vif_release_channel(), so there's no need to call it
535 explicitly in __ieee80211_sta_join_ibss().
537 Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
538 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
540 commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
541 Author: Michal Kazior <michal.kazior@tieto.com>
542 Date: Wed Jan 29 07:56:21 2014 +0100
544 mac80211: add missing CSA locking
546 The patch adds a missing sdata lock and adds a few
547 lockdeps for easier maintenance.
549 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
550 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
552 commit ad17ba7d14d225b109b73c177cd446afb8050598
553 Author: Michal Kazior <michal.kazior@tieto.com>
554 Date: Wed Jan 29 07:56:20 2014 +0100
556 mac80211: fix sdata->radar_required locking
558 radar_required setting wasn't protected by
559 local->mtx in some places. This should prevent
560 from scanning/radar detection/roc colliding.
562 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
563 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
565 commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
566 Author: Michal Kazior <michal.kazior@tieto.com>
567 Date: Wed Jan 29 07:56:19 2014 +0100
569 mac80211: move csa_active setting in STA CSA
571 The sdata->vif.csa_active could be left set after,
572 e.g. channel context constraints check fail in STA
573 mode leaving the interface in a strange state for
574 a brief period of time until it is disconnected.
575 This was harmless but ugly.
577 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
578 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
579 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
581 commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
582 Author: Michal Kazior <michal.kazior@tieto.com>
583 Date: Wed Jan 29 07:56:18 2014 +0100
585 mac80211: fix possible memory leak on AP CSA failure
587 If CSA for AP interface failed and the interface
588 was not stopped afterwards another CSA request
589 would leak sdata->u.ap.next_beacon.
591 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
592 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
593 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
595 commit 3a77ba08940682bf3d52cf14f980337324af9d4a
596 Author: Johannes Berg <johannes.berg@intel.com>
597 Date: Sat Feb 1 00:33:29 2014 +0100
599 mac80211: fix fragmentation code, particularly for encryption
601 The "new" fragmentation code (since my rewrite almost 5 years ago)
602 erroneously sets skb->len rather than using skb_trim() to adjust
603 the length of the first fragment after copying out all the others.
604 This leaves the skb tail pointer pointing to after where the data
605 originally ended, and thus causes the encryption MIC to be written
606 at that point, rather than where it belongs: immediately after the
609 The impact of this is that if software encryption is done, then
610 a) encryption doesn't work for the first fragment, the connection
611 becomes unusable as the first fragment will never be properly
612 verified at the receiver, the MIC is practically guaranteed to
614 b) we leak up to 8 bytes of plaintext (!) of the packet out into
617 This is only mitigated by the fact that many devices are capable
618 of doing encryption in hardware, in which case this can't happen
619 as the tail pointer is irrelevant in that case. Additionally,
620 fragmentation is not used very frequently and would normally have
621 to be configured manually.
623 Fix this by using skb_trim() properly.
625 Cc: stable@vger.kernel.org
626 Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
627 Reported-by: Jouni Malinen <j@w1.fi>
628 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
630 commit de5f242e0c10e841017e37eb8c38974a642dbca8
631 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
632 Date: Tue Jan 28 06:21:59 2014 +0530
634 ath9k: Fix build error on ARM
636 Use mdelay instead of udelay to fix this error:
638 ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
639 make[1]: *** [__modpost] Error 1
640 make: *** [modules] Error 2
642 Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
643 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
645 commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
646 Author: Geert Uytterhoeven <geert@linux-m68k.org>
647 Date: Sun Jan 26 11:53:21 2014 +0100
649 ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
651 drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
652 drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
654 Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
655 optimize ath9k_flush").
657 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
659 commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
660 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
661 Date: Mon Jan 27 11:07:42 2014 +0200
663 mac80211: release the channel in error path in start_ap
665 When the driver cannot start the AP or when the assignement
666 of the beacon goes wrong, we need to unassign the vif.
668 Cc: stable@vger.kernel.org
669 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
670 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
672 commit dfb6889a75c601aedb7450b7e606668e77da6679
673 Author: Johannes Berg <johannes.berg@intel.com>
674 Date: Wed Jan 22 11:14:19 2014 +0200
676 cfg80211: send scan results from work queue
678 Due to the previous commit, when a scan finishes, it is in theory
679 possible to hit the following sequence:
680 1. interface starts being removed
681 2. scan is cancelled by driver and cfg80211 is notified
682 3. scan done work is scheduled
683 4. interface is removed completely, rdev->scan_req is freed,
684 event sent to userspace but scan done work remains pending
685 5. new scan is requested on another virtual interface
686 6. scan done work runs, freeing the still-running scan
688 To fix this situation, hang on to the scan done message and block
689 new scans while that is the case, and only send the message from
690 the work function, regardless of whether the scan_req is already
691 freed from interface removal. This makes step 5 above impossible
692 and changes step 6 to be
693 5. scan done work runs, sending the scan done message
695 As this can't work for wext, so we send the message immediately,
696 but this shouldn't be an issue since we still return -EBUSY.
698 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
700 commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
701 Author: Johannes Berg <johannes.berg@intel.com>
702 Date: Wed Jan 22 11:14:18 2014 +0200
704 cfg80211: fix scan done race
706 When an interface/wdev is removed, any ongoing scan should be
707 cancelled by the driver. This will make it call cfg80211, which
708 only queues a work struct. If interface/wdev removal is quick
709 enough, this can leave the scan request pending and processed
710 only after the interface is gone, causing a use-after-free.
712 Fix this by making sure the scan request is not pending after
713 the interface is destroyed. We can't flush or cancel the work
714 item due to locking concerns, but when it'll run it shouldn't
715 find anything to do. This leaves a potential issue, if a new
716 scan gets requested before the work runs, it prematurely stops
717 the running scan, potentially causing another crash. I'll fix
718 that in the next patch.
720 This was particularly observed with P2P_DEVICE wdevs, likely
721 because freeing them is quicker than freeing netdevs.
723 Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
724 Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
725 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
727 commit ae04fa489ab31b5a10d3cc8399f52761175d4321
728 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
729 Date: Thu Jan 23 14:28:16 2014 +0200
731 mac80211: avoid deadlock revealed by lockdep
733 sdata->u.ap.request_smps_work can’t be flushed synchronously
734 under wdev_lock(wdev) since ieee80211_request_smps_ap_work
735 itself locks the same lock.
736 While at it, reset the driver_smps_mode when the ap is
737 stopped to its default: OFF.
741 ======================================================
742 [ INFO: possible circular locking dependency detected ]
743 3.12.0-ipeer+ #2 Tainted: G O
744 -------------------------------------------------------
745 rmmod/2867 is trying to acquire lock:
746 ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
748 but task is already holding lock:
749 (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
751 which lock already depends on the new lock.
753 the existing dependency chain (in reverse order) is:
755 -> #1 (&wdev->mtx){+.+.+.}:
756 [<c10aefa9>] lock_acquire+0x79/0xe0
757 [<c1607a1a>] mutex_lock_nested+0x4a/0x360
758 [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
759 [<c105cdd8>] process_one_work+0x198/0x450
760 [<c105d469>] worker_thread+0xf9/0x320
761 [<c10669ff>] kthread+0x9f/0xb0
762 [<c1613397>] ret_from_kernel_thread+0x1b/0x28
764 -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
765 [<c10ae9df>] __lock_acquire+0x183f/0x1910
766 [<c10aefa9>] lock_acquire+0x79/0xe0
767 [<c105b917>] flush_work+0x47/0x90
768 [<c105d867>] __cancel_work_timer+0x67/0xe0
769 [<c105d90f>] cancel_work_sync+0xf/0x20
770 [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
771 [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
772 [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
773 [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
774 [<c160f2c9>] notifier_call_chain+0x59/0x130
775 [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
776 [<c106c70f>] raw_notifier_call_chain+0x1f/0x30
777 [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
778 [<c14f8263>] call_netdevice_notifiers+0x13/0x20
779 [<c14f82a4>] __dev_close_many+0x34/0xb0
780 [<c14f83fe>] dev_close_many+0x6e/0xc0
781 [<c14f9c77>] rollback_registered_many+0xa7/0x1f0
782 [<c14f9dd4>] unregister_netdevice_many+0x14/0x60
783 [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
784 [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
785 [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
786 [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
787 [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
788 [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
789 [<c10b8bf9>] SyS_delete_module+0x179/0x2b0
790 [<c1613421>] sysenter_do_call+0x12/0x32
792 Fixes: 687da132234f ("mac80211: implement SMPS for AP")
793 Cc: <stable@vger.kernel.org> [3.13]
794 Reported-by: Ilan Peer <ilan.peer@intel.com>
795 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
796 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
798 commit 178b205e96217164fd7c30113464250d0b6f5eca
799 Author: Johannes Berg <johannes.berg@intel.com>
800 Date: Thu Jan 23 16:32:29 2014 +0100
802 cfg80211: re-enable 5/10 MHz support
804 Unfortunately I forgot this during the merge window, but the
805 patch seems small enough to go in as a fix. The userspace API
806 bug that was the reason for disabling it has long been fixed.
808 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
810 commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
811 Author: Pontus Fuchs <pontus.fuchs@gmail.com>
812 Date: Thu Jan 16 15:00:40 2014 +0100
814 nl80211: Reset split_start when netlink skb is exhausted
816 When the netlink skb is exhausted split_start is left set. In the
817 subsequent retry, with a larger buffer, the dump is continued from the
818 failing point instead of from the beginning.
820 This was causing my rt28xx based USB dongle to now show up when
821 running "iw list" with an old iw version without split dump support.
823 Cc: stable@vger.kernel.org
824 Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
825 Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
826 [avoid the entire workaround when state->split is set]
827 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
829 commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
830 Author: Eliad Peller <eliad@wizery.com>
831 Date: Sun Jan 12 11:06:37 2014 +0200
833 mac80211: move roc cookie assignment earlier
835 ieee80211_start_roc_work() might add a new roc
836 to existing roc, and tell cfg80211 it has already
839 However, this might happen before the roc cookie
840 was set, resulting in REMAIN_ON_CHANNEL (started)
841 event with null cookie. Consequently, it can make
842 wpa_supplicant go out of sync.
844 Fix it by setting the roc cookie earlier.
846 Cc: stable@vger.kernel.org
847 Signed-off-by: Eliad Peller <eliad@wizery.com>
848 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
850 commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
851 Author: Johannes Berg <johannes.berg@intel.com>
852 Date: Fri Jan 24 14:06:29 2014 +0100
854 nl80211: send event when AP operation is stopped
856 There are a few cases, e.g. suspend, where an AP interface is
857 stopped by the kernel rather than by userspace request, most
858 commonly when suspending. To let userspace know about this,
859 send the NL80211_CMD_STOP_AP command as an event every time
860 an AP interface is stopped. This also happens when userspace
861 did in fact request the AP stop, but that's not a problem.
863 For full-MAC drivers this may need to be extended to also
864 cover cases where the device stopped the AP operation for
865 some reason, this a bit more complicated because then all
866 cfg80211 state also needs to be reset; such API is not part
869 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
871 commit d5d567eda7704f190379ca852a8f9a4112e3eee3
872 Author: Johannes Berg <johannes.berg@intel.com>
873 Date: Thu Jan 23 16:20:29 2014 +0100
875 mac80211: add length check in ieee80211_is_robust_mgmt_frame()
877 A few places weren't checking that the frame passed to the
878 function actually has enough data even though the function
879 clearly documents it must have a payload byte. Make this
880 safer by changing the function to take an skb and checking
881 the length inside. The old version is preserved for now as
882 the rtl* drivers use it and don't have a correct skb.
884 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
886 commit f8f6d212a047fc65c7d3442dfc038f65517236fc
887 Author: Johannes Berg <johannes.berg@intel.com>
888 Date: Fri Jan 24 10:53:53 2014 +0100
890 nl80211: fix scheduled scan RSSI matchset attribute confusion
892 The scheduled scan matchsets were intended to be a list of filters,
893 with the found BSS having to pass at least one of them to be passed
894 to the host. When the RSSI attribute was added, however, this was
895 broken and currently wpa_supplicant adds that attribute in its own
896 matchset; however, it doesn't intend that to mean that anything
897 that passes the RSSI filter should be passed to the host, instead
898 it wants it to mean that everything needs to also have higher RSSI.
900 This is semantically problematic because we have a list of filters
901 like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
902 one should be OR'ed and which one AND'ed.
904 To fix this, move the RSSI filter attribute into each matchset. As
905 we need to stay backward compatible, treat a matchset with only the
906 RSSI attribute as a "default RSSI filter" for all other matchsets,
907 but only if there are other matchsets (an RSSI-only matchset by
908 itself is still desirable.)
910 To make driver implementation easier, keep a global min_rssi_thold
911 for the entire request as well. The only affected driver is ath6kl.
913 I found this when I looked into the code after Raja Mani submitted
914 a patch fixing the n_match_sets calculation to disregard the RSSI,
915 but that patch didn't address the semantic issue.
917 Reported-by: Raja Mani <rmani@qti.qualcomm.com>
918 Acked-by: Luciano Coelho <luciano.coelho@intel.com>
919 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
921 commit de553e8545e65a6dc4e45f43df7e1443d4291922
922 Author: Johannes Berg <johannes.berg@intel.com>
923 Date: Fri Jan 24 10:17:47 2014 +0100
925 nl80211: check nla_parse() return values
927 If there's a policy, then nla_parse() return values must be
928 checked, otherwise the policy is useless and there's nothing
929 that ensures the attributes are actually what we expect them
932 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
934 commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
935 Author: Karl Beldan <karl.beldan@rivierawaves.com>
936 Date: Thu Jan 23 20:06:34 2014 +0100
938 mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
940 ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
941 the BA parameters. In the discussion [1] about this patch, Johannes
942 recalled that it fixed some races with the DELBA and indeed this
943 behavior was introduced in [2].
944 While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
945 their BA params TID AC violates the spec and is more a workaround for
946 some drivers. Helmut expressed some concerns wrt such drivers, in
947 particular DELBAs in rt2x00.
949 ATM, DELBAs are sent after a driver has called (hence "purposely")
950 ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
951 details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
952 given to the driver ampdu_action supposed to call this function, which
953 could prove handy to people trying to do the right thing in faulty
954 drivers (if their fw/hw don't get in their way).
956 [1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
957 [2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
959 Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
960 Cc: Helmut Schaa <helmut.schaa@googlemail.com>
961 Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
962 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
963 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
964 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
965 @@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
966 if (nw_type & ADHOC_NETWORK) {
967 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
968 nw_type & ADHOC_CREATOR ? "creator" : "joiner");
969 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
970 + cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
971 cfg80211_put_bss(ar->wiphy, bss);
974 @@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
977 if (vif->nw_type & ADHOC_NETWORK) {
978 - if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
979 + if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
980 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
981 "%s: ath6k not in ibss mode\n", __func__);
984 - memset(bssid, 0, ETH_ALEN);
985 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
989 @@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
990 struct ath6kl_vif *vif = netdev_priv(dev);
993 + int n_match_sets = request->n_match_sets;
996 + * If there's a matchset w/o an SSID, then assume it's just for
997 + * the RSSI (nothing else is currently supported) and ignore it.
998 + * The device only supports a global RSSI filter that we set below.
1000 + if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
1003 if (ar->state != ATH6KL_STATE_ON)
1005 @@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
1006 ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
1008 request->match_sets,
1009 - request->n_match_sets);
1014 - if (!request->n_match_sets) {
1015 + if (!n_match_sets) {
1016 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
1019 @@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
1021 if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
1022 ar->fw_capabilities)) {
1023 - if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1024 + if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1026 - else if (request->rssi_thold < -127)
1027 + else if (request->min_rssi_thold < -127)
1030 - rssi_thold = request->rssi_thold;
1031 + rssi_thold = request->min_rssi_thold;
1033 ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
1035 --- a/drivers/net/wireless/ath/ath9k/hw.c
1036 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1037 @@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
1038 if (AR_SREV_9300_20_OR_LATER(ah))
1040 else if (AR_SREV_9100(ah))
1046 @@ -2051,9 +2051,8 @@ static bool ath9k_hw_set_power_awake(str
1048 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
1049 AR_RTC_FORCE_WAKE_EN);
1051 if (AR_SREV_9100(ah))
1057 --- a/drivers/net/wireless/ath/ath9k/main.c
1058 +++ b/drivers/net/wireless/ath/ath9k/main.c
1059 @@ -451,7 +451,7 @@ void ath9k_tasklet(unsigned long data)
1060 * interrupts are enabled in the reset routine.
1062 atomic_inc(&ah->intr_ref_cnt);
1063 - ath_dbg(common, ANY, "FATAL: Skipping interrupts\n");
1064 + ath_dbg(common, RESET, "FATAL: Skipping interrupts\n");
1068 @@ -471,7 +471,7 @@ void ath9k_tasklet(unsigned long data)
1069 * interrupts are enabled in the reset routine.
1071 atomic_inc(&ah->intr_ref_cnt);
1072 - ath_dbg(common, ANY,
1073 + ath_dbg(common, RESET,
1074 "BB_WATCHDOG: Skipping interrupts\n");
1077 @@ -484,7 +484,7 @@ void ath9k_tasklet(unsigned long data)
1078 type = RESET_TYPE_TX_GTT;
1079 ath9k_queue_reset(sc, type);
1080 atomic_inc(&ah->intr_ref_cnt);
1081 - ath_dbg(common, ANY,
1082 + ath_dbg(common, RESET,
1083 "GTT: Skipping interrupts\n");
1086 @@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
1088 static bool ath9k_has_tx_pending(struct ath_softc *sc)
1093 for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1094 if (!ATH_TXQ_SETUP(sc, i))
1095 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
1096 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
1097 @@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
1098 * config match list.
1100 for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
1101 + /* skip empty SSID matchsets */
1102 + if (!req->match_sets[i].ssid.ssid_len)
1104 scan->direct_scan[i].id = WLAN_EID_SSID;
1105 scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
1106 memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
1107 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1108 +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1109 @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
1110 /* During testing, hdr was NULL */
1113 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1114 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1115 (ieee80211_has_protected(hdr->frame_control)))
1116 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1118 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1119 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1120 @@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
1121 /* In testing, hdr was NULL here */
1124 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1125 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1126 (ieee80211_has_protected(hdr->frame_control)))
1127 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1129 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1130 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1131 @@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
1132 /* during testing, hdr was NULL here */
1135 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1136 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1137 (ieee80211_has_protected(hdr->frame_control)))
1138 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1140 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1141 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1142 @@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
1143 /* during testing, hdr could be NULL here */
1146 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1147 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1148 (ieee80211_has_protected(hdr->frame_control)))
1149 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1151 --- a/include/linux/ieee80211.h
1152 +++ b/include/linux/ieee80211.h
1153 @@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
1157 + * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
1158 + * @fc: frame control field in little-endian byteorder
1160 +static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
1162 + /* IEEE 802.11-2012, definition of "bufferable management frame";
1163 + * note that this ignores the IBSS special case. */
1164 + return ieee80211_is_mgmt(fc) &&
1165 + (ieee80211_is_action(fc) ||
1166 + ieee80211_is_disassoc(fc) ||
1167 + ieee80211_is_deauth(fc));
1171 * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
1172 * @seq_ctrl: frame sequence control bytes in little-endian byteorder
1174 @@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
1178 - * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1179 + * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1180 * @hdr: the frame (buffer must include at least the first octet of payload)
1182 -static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1183 +static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1185 if (ieee80211_is_disassoc(hdr->frame_control) ||
1186 ieee80211_is_deauth(hdr->frame_control))
1187 @@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
1191 + * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
1192 + * @skb: the skb containing the frame, length will be checked
1194 +static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
1196 + if (skb->len < 25)
1198 + return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
1202 * ieee80211_is_public_action - check if frame is a public action frame
1204 * @len: length of the frame
1205 --- a/include/net/cfg80211.h
1206 +++ b/include/net/cfg80211.h
1207 @@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
1208 * struct cfg80211_match_set - sets of attributes to match
1210 * @ssid: SSID to be matched
1211 + * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1213 struct cfg80211_match_set {
1214 struct cfg80211_ssid ssid;
1219 @@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
1220 * @dev: the interface
1221 * @scan_start: start time of the scheduled scan
1222 * @channels: channels to scan
1223 - * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1224 + * @min_rssi_thold: for drivers only supporting a single threshold, this
1225 + * contains the minimum over all matchsets
1227 struct cfg80211_sched_scan_request {
1228 struct cfg80211_ssid *ssids;
1229 @@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
1231 struct cfg80211_match_set *match_sets;
1234 + s32 min_rssi_thold;
1237 struct wiphy *wiphy;
1238 @@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
1239 * @identifier: (private) Identifier used in nl80211 to identify this
1240 * wireless device if it has no netdev
1241 * @current_bss: (private) Used by the internal configuration code
1242 - * @channel: (private) Used by the internal configuration code to track
1243 - * the user-set AP, monitor and WDS channel
1244 + * @chandef: (private) Used by the internal configuration code to track
1245 + * the user-set channel definition.
1246 * @preset_chandef: (private) Used by the internal configuration code to
1247 * track the channel to be used for AP later
1248 * @bssid: (private) Used by the internal configuration code
1249 @@ -3195,9 +3198,7 @@ struct wireless_dev {
1251 struct cfg80211_internal_bss *current_bss; /* associated / joined */
1252 struct cfg80211_chan_def preset_chandef;
1254 - /* for AP and mesh channel tracking */
1255 - struct ieee80211_channel *channel;
1256 + struct cfg80211_chan_def chandef;
1259 bool ibss_dfs_possible;
1260 @@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
1262 * @dev: network device
1263 * @bssid: the BSSID of the IBSS joined
1264 + * @channel: the channel of the IBSS joined
1265 * @gfp: allocation flags
1267 * This function notifies cfg80211 that the device joined an IBSS or
1268 @@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
1269 * with the locally generated beacon -- this guarantees that there is
1270 * always a scan result for this IBSS. cfg80211 will handle the rest.
1272 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
1273 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1274 + struct ieee80211_channel *channel, gfp_t gfp);
1277 * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
1278 --- a/include/uapi/linux/nl80211.h
1279 +++ b/include/uapi/linux/nl80211.h
1280 @@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
1281 * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
1282 * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
1283 * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
1284 - * only report BSS with matching SSID.
1285 + * only report BSS with matching SSID.
1286 * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
1287 - * BSS in scan results. Filtering is turned off if not specified.
1288 + * BSS in scan results. Filtering is turned off if not specified. Note that
1289 + * if this attribute is in a match set of its own, then it is treated as
1290 + * the default value for all matchsets with an SSID, rather than being a
1291 + * matchset of its own without an RSSI filter. This is due to problems with
1292 + * how this API was implemented in the past. Also, due to the same problem,
1293 + * the only way to create a matchset with only an RSSI filter (with this
1294 + * attribute) is if there's only a single matchset with the RSSI attribute.
1295 * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
1296 * attribute number currently defined
1297 * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
1298 --- a/net/mac80211/agg-tx.c
1299 +++ b/net/mac80211/agg-tx.c
1300 @@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
1301 mgmt->u.action.u.addba_req.start_seq_num =
1302 cpu_to_le16(start_seq_num << 4);
1304 - ieee80211_tx_skb_tid(sdata, skb, tid);
1305 + ieee80211_tx_skb(sdata, skb);
1308 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
1309 --- a/net/mac80211/cfg.c
1310 +++ b/net/mac80211/cfg.c
1311 @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
1312 /* TODO: make hostapd tell us what it wants */
1313 sdata->smps_mode = IEEE80211_SMPS_OFF;
1314 sdata->needed_rx_chains = sdata->local->rx_chains;
1315 - sdata->radar_required = params->radar_required;
1317 mutex_lock(&local->mtx);
1318 + sdata->radar_required = params->radar_required;
1319 err = ieee80211_vif_use_channel(sdata, ¶ms->chandef,
1320 IEEE80211_CHANCTX_SHARED);
1321 mutex_unlock(&local->mtx);
1322 @@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
1323 IEEE80211_P2P_OPPPS_ENABLE_BIT;
1325 err = ieee80211_assign_beacon(sdata, ¶ms->beacon);
1328 + ieee80211_vif_release_channel(sdata);
1333 err = drv_start_ap(sdata->local, sdata);
1334 @@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
1336 kfree_rcu(old, rcu_head);
1337 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
1338 + ieee80211_vif_release_channel(sdata);
1342 @@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
1345 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
1346 + sdata_assert_lock(sdata);
1348 /* don't allow changing the beacon while CSA is in place - offset
1349 * of channel switch counter may change
1350 @@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
1351 struct probe_resp *old_probe_resp;
1352 struct cfg80211_chan_def chandef;
1354 + sdata_assert_lock(sdata);
1356 old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
1359 @@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
1360 kfree(sdata->u.ap.next_beacon);
1361 sdata->u.ap.next_beacon = NULL;
1363 - cancel_work_sync(&sdata->u.ap.request_smps_work);
1365 /* turn off carrier for this interface and dependent VLANs */
1366 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1367 netif_carrier_off(vlan->dev);
1368 @@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
1369 kfree_rcu(old_beacon, rcu_head);
1371 kfree_rcu(old_probe_resp, rcu_head);
1372 + sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
1374 __sta_info_flush(sdata, true);
1375 ieee80211_free_keys(sdata, true);
1376 @@ -2638,6 +2643,24 @@ static int ieee80211_start_roc_work(stru
1377 INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
1378 INIT_LIST_HEAD(&roc->dependents);
1381 + * cookie is either the roc cookie (for normal roc)
1382 + * or the SKB (for mgmt TX)
1385 + /* local->mtx protects this */
1386 + local->roc_cookie_counter++;
1387 + roc->cookie = local->roc_cookie_counter;
1388 + /* wow, you wrapped 64 bits ... more likely a bug */
1389 + if (WARN_ON(roc->cookie == 0)) {
1391 + local->roc_cookie_counter++;
1393 + *cookie = roc->cookie;
1395 + *cookie = (unsigned long)txskb;
1398 /* if there's one pending or we're scanning, queue this one */
1399 if (!list_empty(&local->roc_list) ||
1400 local->scanning || local->radar_detect_enabled)
1401 @@ -2772,24 +2795,6 @@ static int ieee80211_start_roc_work(stru
1403 list_add_tail(&roc->list, &local->roc_list);
1406 - * cookie is either the roc cookie (for normal roc)
1407 - * or the SKB (for mgmt TX)
1410 - /* local->mtx protects this */
1411 - local->roc_cookie_counter++;
1412 - roc->cookie = local->roc_cookie_counter;
1413 - /* wow, you wrapped 64 bits ... more likely a bug */
1414 - if (WARN_ON(roc->cookie == 0)) {
1416 - local->roc_cookie_counter++;
1418 - *cookie = roc->cookie;
1420 - *cookie = (unsigned long)txskb;
1426 @@ -3004,8 +3009,10 @@ void ieee80211_csa_finalize_work(struct
1427 if (!ieee80211_sdata_running(sdata))
1430 - sdata->radar_required = sdata->csa_radar_required;
1431 + sdata_assert_lock(sdata);
1433 mutex_lock(&local->mtx);
1434 + sdata->radar_required = sdata->csa_radar_required;
1435 err = ieee80211_vif_change_channel(sdata, &changed);
1436 mutex_unlock(&local->mtx);
1437 if (WARN_ON(err < 0))
1438 @@ -3022,13 +3029,13 @@ void ieee80211_csa_finalize_work(struct
1439 switch (sdata->vif.type) {
1440 case NL80211_IFTYPE_AP:
1441 err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
1442 + kfree(sdata->u.ap.next_beacon);
1443 + sdata->u.ap.next_beacon = NULL;
1449 - kfree(sdata->u.ap.next_beacon);
1450 - sdata->u.ap.next_beacon = NULL;
1452 ieee80211_bss_info_change_notify(sdata, err);
1454 case NL80211_IFTYPE_ADHOC:
1455 @@ -3066,7 +3073,7 @@ int ieee80211_channel_switch(struct wiph
1456 struct ieee80211_if_mesh __maybe_unused *ifmsh;
1457 int err, num_chanctx;
1459 - lockdep_assert_held(&sdata->wdev.mtx);
1460 + sdata_assert_lock(sdata);
1462 if (!list_empty(&local->roc_list) || local->scanning)
1464 --- a/net/mac80211/ht.c
1465 +++ b/net/mac80211/ht.c
1466 @@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
1467 mgmt->u.action.u.delba.params = cpu_to_le16(params);
1468 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
1470 - ieee80211_tx_skb_tid(sdata, skb, tid);
1471 + ieee80211_tx_skb(sdata, skb);
1474 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
1475 @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
1476 u.ap.request_smps_work);
1479 - __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
1480 + if (sdata_dereference(sdata->u.ap.beacon, sdata))
1481 + __ieee80211_request_smps_ap(sdata,
1482 + sdata->u.ap.driver_smps_mode);
1483 sdata_unlock(sdata);
1486 --- a/net/mac80211/iface.c
1487 +++ b/net/mac80211/iface.c
1488 @@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
1490 ieee80211_roc_purge(local, sdata);
1492 - if (sdata->vif.type == NL80211_IFTYPE_STATION)
1493 + switch (sdata->vif.type) {
1494 + case NL80211_IFTYPE_STATION:
1495 ieee80211_mgd_stop(sdata);
1497 - if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
1499 + case NL80211_IFTYPE_ADHOC:
1500 ieee80211_ibss_stop(sdata);
1503 + case NL80211_IFTYPE_AP:
1504 + cancel_work_sync(&sdata->u.ap.request_smps_work);
1511 * Remove all stations associated with this interface.
1512 @@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
1513 cancel_work_sync(&local->dynamic_ps_enable_work);
1515 cancel_work_sync(&sdata->recalc_smps);
1516 + sdata_lock(sdata);
1517 sdata->vif.csa_active = false;
1518 + sdata_unlock(sdata);
1519 cancel_work_sync(&sdata->csa_finalize_work);
1521 cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
1522 --- a/net/mac80211/rx.c
1523 +++ b/net/mac80211/rx.c
1524 @@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
1526 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1528 - if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
1529 + if (is_multicast_ether_addr(hdr->addr1))
1532 - return ieee80211_is_robust_mgmt_frame(hdr);
1533 + return ieee80211_is_robust_mgmt_frame(skb);
1537 @@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
1539 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1541 - if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
1542 + if (!is_multicast_ether_addr(hdr->addr1))
1545 - return ieee80211_is_robust_mgmt_frame(hdr);
1546 + return ieee80211_is_robust_mgmt_frame(skb);
1550 @@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
1551 if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
1554 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
1555 + if (!ieee80211_is_robust_mgmt_frame(skb))
1556 return -1; /* not a robust management frame */
1558 mmie = (struct ieee80211_mmie *)
1559 @@ -1128,6 +1128,13 @@ static void sta_ps_end(struct sta_info *
1560 sta->sta.addr, sta->sta.aid);
1562 if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1564 + * Clear the flag only if the other one is still set
1565 + * so that the TX path won't start TX'ing new frames
1566 + * directly ... In the case that the driver flag isn't
1567 + * set ieee80211_sta_ps_deliver_wakeup() will clear it.
1569 + clear_sta_flag(sta, WLAN_STA_PS_STA);
1570 ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
1571 sta->sta.addr, sta->sta.aid);
1573 @@ -1311,18 +1318,15 @@ ieee80211_rx_h_sta_process(struct ieee80
1574 !ieee80211_has_morefrags(hdr->frame_control) &&
1575 !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
1576 (rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1577 - rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
1578 + rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1579 + /* PM bit is only checked in frames where it isn't reserved,
1580 + * in AP mode it's reserved in non-bufferable management frames
1581 + * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1583 + (!ieee80211_is_mgmt(hdr->frame_control) ||
1584 + ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1585 if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
1587 - * Ignore doze->wake transitions that are
1588 - * indicated by non-data frames, the standard
1589 - * is unclear here, but for example going to
1590 - * PS mode and then scanning would cause a
1591 - * doze->wake transition for the probe request,
1592 - * and that is clearly undesirable.
1594 - if (ieee80211_is_data(hdr->frame_control) &&
1595 - !ieee80211_has_pm(hdr->frame_control))
1596 + if (!ieee80211_has_pm(hdr->frame_control))
1599 if (ieee80211_has_pm(hdr->frame_control))
1600 @@ -1845,8 +1849,7 @@ static int ieee80211_drop_unencrypted_mg
1601 * having configured keys.
1603 if (unlikely(ieee80211_is_action(fc) && !rx->key &&
1604 - ieee80211_is_robust_mgmt_frame(
1605 - (struct ieee80211_hdr *) rx->skb->data)))
1606 + ieee80211_is_robust_mgmt_frame(rx->skb)))
1610 --- a/net/mac80211/tx.c
1611 +++ b/net/mac80211/tx.c
1612 @@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc,
1613 if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
1616 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
1618 + if (!ieee80211_is_robust_mgmt_frame(skb))
1622 @@ -478,6 +477,20 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1623 sta->sta.addr, sta->sta.aid, ac);
1624 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
1625 purge_old_ps_buffers(tx->local);
1627 + /* sync with ieee80211_sta_ps_deliver_wakeup */
1628 + spin_lock(&sta->ps_lock);
1630 + * STA woke up the meantime and all the frames on ps_tx_buf have
1631 + * been queued to pending queue. No reordering can happen, go
1632 + * ahead and Tx the packet.
1634 + if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
1635 + !test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1636 + spin_unlock(&sta->ps_lock);
1637 + return TX_CONTINUE;
1640 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
1641 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
1643 @@ -492,6 +505,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1644 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
1645 info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
1646 skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb);
1647 + spin_unlock(&sta->ps_lock);
1649 if (!timer_pending(&local->sta_cleanup))
1650 mod_timer(&local->sta_cleanup,
1651 @@ -525,9 +539,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
1653 /* only deauth, disassoc and action are bufferable MMPDUs */
1654 if (ieee80211_is_mgmt(hdr->frame_control) &&
1655 - !ieee80211_is_deauth(hdr->frame_control) &&
1656 - !ieee80211_is_disassoc(hdr->frame_control) &&
1657 - !ieee80211_is_action(hdr->frame_control)) {
1658 + !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
1659 if (tx->flags & IEEE80211_TX_UNICAST)
1660 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1662 @@ -567,7 +579,7 @@ ieee80211_tx_h_select_key(struct ieee802
1664 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1665 is_multicast_ether_addr(hdr->addr1) &&
1666 - ieee80211_is_robust_mgmt_frame(hdr) &&
1667 + ieee80211_is_robust_mgmt_frame(tx->skb) &&
1668 (key = rcu_dereference(tx->sdata->default_mgmt_key)))
1670 else if (is_multicast_ether_addr(hdr->addr1) &&
1671 @@ -582,12 +594,12 @@ ieee80211_tx_h_select_key(struct ieee802
1673 else if (tx->skb->protocol == tx->sdata->control_port_protocol)
1675 - else if (ieee80211_is_robust_mgmt_frame(hdr) &&
1676 + else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
1677 !(ieee80211_is_action(hdr->frame_control) &&
1678 tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
1680 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1681 - !ieee80211_is_robust_mgmt_frame(hdr))
1682 + !ieee80211_is_robust_mgmt_frame(tx->skb))
1685 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
1686 @@ -878,7 +890,7 @@ static int ieee80211_fragment(struct iee
1689 /* adjust first fragment's length */
1690 - skb->len = hdrlen + per_fragm;
1691 + skb_trim(skb, hdrlen + per_fragm);
1695 --- a/net/mac80211/wpa.c
1696 +++ b/net/mac80211/wpa.c
1697 @@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
1698 hdrlen = ieee80211_hdrlen(hdr->frame_control);
1700 if (!ieee80211_is_data(hdr->frame_control) &&
1701 - !ieee80211_is_robust_mgmt_frame(hdr))
1702 + !ieee80211_is_robust_mgmt_frame(skb))
1705 data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
1706 --- a/net/wireless/ap.c
1707 +++ b/net/wireless/ap.c
1708 @@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
1709 err = rdev_stop_ap(rdev, dev);
1711 wdev->beacon_interval = 0;
1712 - wdev->channel = NULL;
1713 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
1715 rdev_set_qos_map(rdev, dev, NULL);
1716 + nl80211_send_ap_stopped(wdev);
1720 --- a/net/wireless/core.c
1721 +++ b/net/wireless/core.c
1722 @@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
1726 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1727 - !rdev->scan_req->notified);
1728 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1729 + if (WARN_ON(!rdev->scan_req->notified))
1730 + rdev->scan_req->aborted = true;
1731 + ___cfg80211_scan_done(rdev, false);
1735 static int cfg80211_rfkill_set_block(void *data, bool blocked)
1736 @@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
1738 u16 ifmodes = wiphy->interface_modes;
1740 - /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
1741 - wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
1744 * There are major locking problems in nl80211/mac80211 for CSA,
1745 * disable for all drivers until this has been reworked.
1746 @@ -875,8 +875,11 @@ static int cfg80211_netdev_notifier_call
1749 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
1750 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
1751 - !rdev->scan_req->notified);
1752 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
1753 + if (WARN_ON(!rdev->scan_req->notified))
1754 + rdev->scan_req->aborted = true;
1755 + ___cfg80211_scan_done(rdev, false);
1758 if (WARN_ON(rdev->sched_scan_req &&
1759 rdev->sched_scan_req->dev == wdev->netdev)) {
1760 --- a/net/wireless/core.h
1761 +++ b/net/wireless/core.h
1762 @@ -62,6 +62,7 @@ struct cfg80211_registered_device {
1763 struct rb_root bss_tree;
1765 struct cfg80211_scan_request *scan_req; /* protected by RTNL */
1766 + struct sk_buff *scan_msg;
1767 struct cfg80211_sched_scan_request *sched_scan_req;
1768 unsigned long suspend_at;
1769 struct work_struct scan_done_wk;
1770 @@ -210,6 +211,7 @@ struct cfg80211_event {
1774 + struct ieee80211_channel *channel;
1778 @@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
1779 struct net_device *dev, bool nowext);
1780 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
1781 struct net_device *dev, bool nowext);
1782 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
1783 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1784 + struct ieee80211_channel *channel);
1785 int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
1786 struct wireless_dev *wdev);
1788 @@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
1789 struct key_params *params, int key_idx,
1790 bool pairwise, const u8 *mac_addr);
1791 void __cfg80211_scan_done(struct work_struct *wk);
1792 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
1793 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
1794 + bool send_message);
1795 void __cfg80211_sched_scan_results(struct work_struct *wk);
1796 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
1797 bool driver_initiated);
1798 @@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
1800 cfg80211_get_chan_state(struct wireless_dev *wdev,
1801 struct ieee80211_channel **chan,
1802 - enum cfg80211_chan_mode *chanmode);
1803 + enum cfg80211_chan_mode *chanmode,
1804 + u8 *radar_detect);
1806 int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
1807 struct cfg80211_chan_def *chandef);
1808 --- a/net/wireless/nl80211.c
1809 +++ b/net/wireless/nl80211.c
1810 @@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
1811 * We can then retry with the larger buffer.
1813 if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
1815 + !skb->len && !state->split &&
1816 cb->min_dump_alloc < 4096) {
1817 cb->min_dump_alloc = 4096;
1818 + state->split_start = 0;
1822 @@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
1823 nla_for_each_nested(nl_txq_params,
1824 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
1826 - nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1827 - nla_data(nl_txq_params),
1828 - nla_len(nl_txq_params),
1829 - txq_params_policy);
1830 + result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
1831 + nla_data(nl_txq_params),
1832 + nla_len(nl_txq_params),
1833 + txq_params_policy);
1836 result = parse_txq_params(tb, &txq_params);
1839 @@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
1841 wdev->preset_chandef = params.chandef;
1842 wdev->beacon_interval = params.beacon_interval;
1843 - wdev->channel = params.chandef.chan;
1844 + wdev->chandef = params.chandef;
1845 wdev->ssid_len = params.ssid_len;
1846 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
1848 @@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
1850 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
1852 - nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1853 - nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1855 + r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
1856 + nla_data(nl_reg_rule), nla_len(nl_reg_rule),
1860 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
1863 @@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
1864 if (!rdev->ops->scan)
1867 - if (rdev->scan_req) {
1868 + if (rdev->scan_req || rdev->scan_msg) {
1872 @@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
1873 enum ieee80211_band band;
1875 struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
1876 + s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
1878 if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
1879 !rdev->ops->sched_scan_start)
1880 @@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
1881 if (n_ssids > wiphy->max_sched_scan_ssids)
1884 - if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
1886 + * First, count the number of 'real' matchsets. Due to an issue with
1887 + * the old implementation, matchsets containing only the RSSI attribute
1888 + * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
1889 + * RSSI for all matchsets, rather than their own matchset for reporting
1890 + * all APs with a strong RSSI. This is needed to be compatible with
1891 + * older userspace that treated a matchset with only the RSSI as the
1892 + * global RSSI for all other matchsets - if there are other matchsets.
1894 + if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
1895 nla_for_each_nested(attr,
1896 info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
1900 + struct nlattr *rssi;
1902 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1903 + nla_data(attr), nla_len(attr),
1904 + nl80211_match_policy);
1907 + /* add other standalone attributes here */
1908 + if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
1912 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1914 + default_match_rssi = nla_get_s32(rssi);
1918 + /* However, if there's no other matchset, add the RSSI one */
1919 + if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
1922 if (n_match_sets > wiphy->max_match_sets)
1924 @@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
1926 struct nlattr *ssid, *rssi;
1928 - nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1929 - nla_data(attr), nla_len(attr),
1930 - nl80211_match_policy);
1931 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
1932 + nla_data(attr), nla_len(attr),
1933 + nl80211_match_policy);
1936 ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
1938 + if (WARN_ON(i >= n_match_sets)) {
1939 + /* this indicates a programming error,
1940 + * the loop above should have verified
1947 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
1950 @@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
1951 nla_data(ssid), nla_len(ssid));
1952 request->match_sets[i].ssid.ssid_len =
1954 + /* special attribute - old implemenation w/a */
1955 + request->match_sets[i].rssi_thold =
1956 + default_match_rssi;
1957 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1959 + request->match_sets[i].rssi_thold =
1960 + nla_get_s32(rssi);
1962 - rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
1964 - request->rssi_thold = nla_get_u32(rssi);
1966 - request->rssi_thold =
1967 - NL80211_SCAN_RSSI_THOLD_OFF;
1971 + /* there was no other matchset, so the RSSI one is alone */
1973 + request->match_sets[0].rssi_thold = default_match_rssi;
1975 + request->min_rssi_thold = INT_MAX;
1976 + for (i = 0; i < n_match_sets; i++)
1977 + request->min_rssi_thold =
1978 + min(request->match_sets[i].rssi_thold,
1979 + request->min_rssi_thold);
1981 + request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
1984 if (info->attrs[NL80211_ATTR_IE]) {
1985 @@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
1987 err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
1989 - wdev->channel = chandef.chan;
1990 + wdev->chandef = chandef;
1991 wdev->cac_started = true;
1992 wdev->cac_start_time = jiffies;
1994 @@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
1995 * directly to the enum ieee80211_band values used in cfg80211.
1997 BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
1998 - nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
2000 + nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
2001 enum ieee80211_band band = nla_type(tx_rates);
2004 if (band < 0 || band >= IEEE80211_NUM_BANDS)
2006 sband = rdev->wiphy.bands[band];
2009 - nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2010 - nla_len(tx_rates), nl80211_txattr_policy);
2011 + err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2012 + nla_len(tx_rates), nl80211_txattr_policy);
2015 if (tb[NL80211_TXRATE_LEGACY]) {
2016 mask.control[band].legacy = rateset_to_mask(
2018 @@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
2019 NL80211_MCGRP_SCAN, GFP_KERNEL);
2022 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2023 - struct wireless_dev *wdev)
2024 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2025 + struct wireless_dev *wdev, bool aborted)
2027 struct sk_buff *msg;
2029 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2034 if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2035 - NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2036 + aborted ? NL80211_CMD_SCAN_ABORTED :
2037 + NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2043 - genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2044 - NL80211_MCGRP_SCAN, GFP_KERNEL);
2048 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2049 - struct wireless_dev *wdev)
2050 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2051 + struct sk_buff *msg)
2053 - struct sk_buff *msg;
2055 - msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2059 - if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2060 - NL80211_CMD_SCAN_ABORTED) < 0) {
2065 genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2066 NL80211_MCGRP_SCAN, GFP_KERNEL);
2068 @@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
2069 wdev->iftype != NL80211_IFTYPE_MESH_POINT))
2072 - wdev->channel = chandef->chan;
2073 + wdev->chandef = *chandef;
2074 + wdev->preset_chandef = *chandef;
2075 nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
2077 EXPORT_SYMBOL(cfg80211_ch_switch_notify);
2078 @@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct
2080 EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
2082 +void nl80211_send_ap_stopped(struct wireless_dev *wdev)
2084 + struct wiphy *wiphy = wdev->wiphy;
2085 + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
2086 + struct sk_buff *msg;
2089 + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2093 + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
2097 + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
2098 + nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
2099 + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
2102 + genlmsg_end(msg, hdr);
2104 + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
2105 + NL80211_MCGRP_MLME, GFP_KERNEL);
2111 /* initialisation/exit functions */
2113 int nl80211_init(void)
2114 --- a/net/wireless/nl80211.h
2115 +++ b/net/wireless/nl80211.h
2116 @@ -8,10 +8,10 @@ void nl80211_exit(void);
2117 void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
2118 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
2119 struct wireless_dev *wdev);
2120 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2121 - struct wireless_dev *wdev);
2122 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2123 - struct wireless_dev *wdev);
2124 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2125 + struct wireless_dev *wdev, bool aborted);
2126 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2127 + struct sk_buff *msg);
2128 void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
2129 struct net_device *netdev, u32 cmd);
2130 void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
2131 @@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
2132 enum nl80211_radar_event event,
2133 struct net_device *netdev, gfp_t gfp);
2135 +void nl80211_send_ap_stopped(struct wireless_dev *wdev);
2137 void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
2139 #endif /* __NET_WIRELESS_NL80211_H */
2140 --- a/net/wireless/scan.c
2141 +++ b/net/wireless/scan.c
2142 @@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
2143 dev->bss_generation++;
2146 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
2147 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2148 + bool send_message)
2150 struct cfg80211_scan_request *request;
2151 struct wireless_dev *wdev;
2152 + struct sk_buff *msg;
2153 #ifdef CPTCFG_CFG80211_WEXT
2154 union iwreq_data wrqu;
2159 - request = rdev->scan_req;
2160 + if (rdev->scan_msg) {
2161 + nl80211_send_scan_result(rdev, rdev->scan_msg);
2162 + rdev->scan_msg = NULL;
2166 + request = rdev->scan_req;
2170 @@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
2172 cfg80211_sme_scan_done(wdev->netdev);
2174 - if (request->aborted) {
2175 - nl80211_send_scan_aborted(rdev, wdev);
2177 - if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
2178 - /* flush entries from previous scans */
2179 - spin_lock_bh(&rdev->bss_lock);
2180 - __cfg80211_bss_expire(rdev, request->scan_start);
2181 - spin_unlock_bh(&rdev->bss_lock);
2183 - nl80211_send_scan_done(rdev, wdev);
2184 + if (!request->aborted &&
2185 + request->flags & NL80211_SCAN_FLAG_FLUSH) {
2186 + /* flush entries from previous scans */
2187 + spin_lock_bh(&rdev->bss_lock);
2188 + __cfg80211_bss_expire(rdev, request->scan_start);
2189 + spin_unlock_bh(&rdev->bss_lock);
2192 + msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
2194 #ifdef CPTCFG_CFG80211_WEXT
2195 if (wdev->netdev && !request->aborted) {
2196 memset(&wrqu, 0, sizeof(wrqu));
2197 @@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
2199 rdev->scan_req = NULL;
2202 + if (!send_message)
2203 + rdev->scan_msg = msg;
2205 + nl80211_send_scan_result(rdev, msg);
2208 void __cfg80211_scan_done(struct work_struct *wk)
2209 @@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
2213 - ___cfg80211_scan_done(rdev);
2214 + ___cfg80211_scan_done(rdev, true);
2218 @@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
2220 return PTR_ERR(rdev);
2222 - if (rdev->scan_req) {
2223 + if (rdev->scan_req || rdev->scan_msg) {
2227 @@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
2229 return PTR_ERR(rdev);
2231 - if (rdev->scan_req)
2232 + if (rdev->scan_req || rdev->scan_msg)
2235 res = ieee80211_scan_results(rdev, info, extra, data->length);
2236 --- a/net/wireless/sme.c
2237 +++ b/net/wireless/sme.c
2238 @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
2239 ASSERT_RDEV_LOCK(rdev);
2240 ASSERT_WDEV_LOCK(wdev);
2242 - if (rdev->scan_req)
2243 + if (rdev->scan_req || rdev->scan_msg)
2246 if (wdev->conn->params.channel)
2247 --- a/net/mac80211/mlme.c
2248 +++ b/net/mac80211/mlme.c
2249 @@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct
2252 ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
2253 - sdata->vif.csa_active = true;
2255 mutex_lock(&local->chanctx_mtx);
2256 if (local->use_chanctx) {
2257 @@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct
2258 mutex_unlock(&local->chanctx_mtx);
2260 sdata->csa_chandef = csa_ie.chandef;
2261 + sdata->vif.csa_active = true;
2264 ieee80211_stop_queues_by_reason(&local->hw,
2265 --- a/net/mac80211/chan.c
2266 +++ b/net/mac80211/chan.c
2267 @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
2269 struct ieee80211_sub_if_data *sdata;
2271 + lockdep_assert_held(&local->mtx);
2274 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2275 if (sdata->radar_required) {
2276 --- a/net/mac80211/ibss.c
2277 +++ b/net/mac80211/ibss.c
2278 @@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
2281 mutex_lock(&local->mtx);
2282 - ieee80211_vif_release_channel(sdata);
2283 if (ieee80211_vif_use_channel(sdata, &chandef,
2284 ifibss->fixed_channel ?
2285 IEEE80211_CHANCTX_SHARED :
2286 @@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
2287 mutex_unlock(&local->mtx);
2290 + sdata->radar_required = radar_required;
2291 mutex_unlock(&local->mtx);
2293 memcpy(ifibss->bssid, bssid, ETH_ALEN);
2294 @@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
2295 rcu_assign_pointer(ifibss->presp, presp);
2296 mgmt = (void *)presp->head;
2298 - sdata->radar_required = radar_required;
2299 sdata->vif.bss_conf.enable_beacon = true;
2300 sdata->vif.bss_conf.beacon_int = beacon_int;
2301 sdata->vif.bss_conf.basic_rates = basic_rates;
2302 @@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
2303 presp->head_len, 0, GFP_KERNEL);
2304 cfg80211_put_bss(local->hw.wiphy, bss);
2305 netif_carrier_on(sdata->dev);
2306 - cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
2307 + cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
2310 static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
2311 @@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
2315 + sdata_assert_lock(sdata);
2317 sta_flags = IEEE80211_STA_DISABLE_VHT;
2318 switch (ifibss->chandef.width) {
2319 case NL80211_CHAN_WIDTH_5:
2320 @@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
2321 memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
2322 ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
2323 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
2325 + /* avoid excessive retries for probe request to wildcard SSIDs */
2327 + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
2329 ieee80211_tx_skb(sdata, skb);
2332 --- a/net/mac80211/mesh.c
2333 +++ b/net/mac80211/mesh.c
2334 @@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct
2335 if (!ifmsh->mesh_id)
2338 + sdata_assert_lock(sdata);
2340 sta_flags = IEEE80211_STA_DISABLE_VHT;
2341 switch (sdata->vif.bss_conf.chandef.width) {
2342 case NL80211_CHAN_WIDTH_20_NOHT:
2343 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2344 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2345 @@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
2346 struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
2347 struct net_device *ndev = ifp->ndev;
2348 struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
2349 + struct ieee80211_channel *chan;
2352 if (ifp->vif->mode == WL_MODE_AP) {
2353 @@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
2354 } else if (brcmf_is_linkup(e)) {
2355 brcmf_dbg(CONN, "Linkup\n");
2356 if (brcmf_is_ibssmode(ifp->vif)) {
2357 + chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
2358 memcpy(profile->bssid, e->addr, ETH_ALEN);
2359 wl_inform_ibss(cfg, ndev, e->addr);
2360 - cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
2361 + cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
2362 clear_bit(BRCMF_VIF_STATUS_CONNECTING,
2363 &ifp->vif->sme_state);
2364 set_bit(BRCMF_VIF_STATUS_CONNECTED,
2365 --- a/drivers/net/wireless/libertas/cfg.c
2366 +++ b/drivers/net/wireless/libertas/cfg.c
2367 @@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
2368 memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
2369 priv->wdev->ssid_len = params->ssid_len;
2371 - cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
2372 + cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
2375 /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
2376 priv->connect_status = LBS_CONNECTED;
2377 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2378 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2379 @@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy
2383 - cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
2384 + cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
2385 + params->chandef.chan, GFP_KERNEL);
2386 dev_dbg(priv->adapter->dev,
2387 "info: joined/created adhoc network with bssid"
2388 " %pM successfully\n", priv->cfg_bssid);
2389 --- a/drivers/net/wireless/rndis_wlan.c
2390 +++ b/drivers/net/wireless/rndis_wlan.c
2391 @@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
2392 bssid, req_ie, req_ie_len,
2393 resp_ie, resp_ie_len, GFP_KERNEL);
2394 } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
2395 - cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
2396 + cfg80211_ibss_joined(usbdev->net, bssid,
2397 + get_current_channel(usbdev, NULL),
2402 --- a/net/wireless/ibss.c
2403 +++ b/net/wireless/ibss.c
2405 #include "rdev-ops.h"
2408 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
2409 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2410 + struct ieee80211_channel *channel)
2412 struct wireless_dev *wdev = dev->ieee80211_ptr;
2413 struct cfg80211_bss *bss;
2414 @@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
2415 if (!wdev->ssid_len)
2418 - bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
2419 - wdev->ssid, wdev->ssid_len,
2420 + bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
2421 WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
2424 @@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
2428 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
2429 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2430 + struct ieee80211_channel *channel, gfp_t gfp)
2432 struct wireless_dev *wdev = dev->ieee80211_ptr;
2433 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
2434 struct cfg80211_event *ev;
2435 unsigned long flags;
2437 - trace_cfg80211_ibss_joined(dev, bssid);
2438 + trace_cfg80211_ibss_joined(dev, bssid, channel);
2440 + if (WARN_ON(!channel))
2443 ev = kzalloc(sizeof(*ev), gfp);
2447 ev->type = EVENT_IBSS_JOINED;
2448 - memcpy(ev->cr.bssid, bssid, ETH_ALEN);
2449 + memcpy(ev->ij.bssid, bssid, ETH_ALEN);
2450 + ev->ij.channel = channel;
2452 spin_lock_irqsave(&wdev->event_lock, flags);
2453 list_add_tail(&ev->list, &wdev->event_list);
2454 @@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
2456 wdev->ibss_fixed = params->channel_fixed;
2457 wdev->ibss_dfs_possible = params->userspace_handles_dfs;
2458 + wdev->chandef = params->chandef;
2459 #ifdef CPTCFG_CFG80211_WEXT
2460 wdev->wext.ibss.chandef = params->chandef;
2462 @@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
2464 wdev->current_bss = NULL;
2466 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2467 #ifdef CPTCFG_CFG80211_WEXT
2469 wdev->wext.ibss.ssid_len = 0;
2470 --- a/net/wireless/trace.h
2471 +++ b/net/wireless/trace.h
2472 @@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
2473 TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
2476 -DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
2477 - TP_PROTO(struct net_device *netdev, const u8 *addr),
2478 - TP_ARGS(netdev, addr)
2481 DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
2482 TP_PROTO(struct net_device *netdev, const u8 *addr),
2483 TP_ARGS(netdev, addr)
2484 @@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
2485 TP_ARGS(netdev, addr)
2488 +TRACE_EVENT(cfg80211_ibss_joined,
2489 + TP_PROTO(struct net_device *netdev, const u8 *bssid,
2490 + struct ieee80211_channel *channel),
2491 + TP_ARGS(netdev, bssid, channel),
2499 + MAC_ASSIGN(bssid, bssid);
2500 + CHAN_ASSIGN(channel);
2502 + TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
2503 + NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
2506 TRACE_EVENT(cfg80211_probe_status,
2507 TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
2509 --- a/net/wireless/util.c
2510 +++ b/net/wireless/util.c
2511 @@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
2512 ev->dc.reason, true);
2514 case EVENT_IBSS_JOINED:
2515 - __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
2516 + __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
2521 @@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct
2523 mutex_lock_nested(&wdev_iter->mtx, 1);
2524 __acquire(wdev_iter->mtx);
2525 - cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
2526 + cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
2527 wdev_unlock(wdev_iter);
2530 --- a/net/wireless/chan.c
2531 +++ b/net/wireless/chan.c
2532 @@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct
2534 cfg80211_get_chan_state(struct wireless_dev *wdev,
2535 struct ieee80211_channel **chan,
2536 - enum cfg80211_chan_mode *chanmode)
2537 + enum cfg80211_chan_mode *chanmode,
2541 *chanmode = CHAN_MODE_UNDEFINED;
2542 @@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
2543 !wdev->ibss_dfs_possible)
2545 : CHAN_MODE_EXCLUSIVE;
2547 + /* consider worst-case - IBSS can try to return to the
2548 + * original user-specified channel as creator */
2549 + if (wdev->ibss_dfs_possible)
2550 + *radar_detect |= BIT(wdev->chandef.width);
2554 @@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
2555 case NL80211_IFTYPE_AP:
2556 case NL80211_IFTYPE_P2P_GO:
2557 if (wdev->cac_started) {
2558 - *chan = wdev->channel;
2559 + *chan = wdev->chandef.chan;
2560 *chanmode = CHAN_MODE_SHARED;
2561 + *radar_detect |= BIT(wdev->chandef.width);
2562 } else if (wdev->beacon_interval) {
2563 - *chan = wdev->channel;
2564 + *chan = wdev->chandef.chan;
2565 *chanmode = CHAN_MODE_SHARED;
2567 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2569 + *radar_detect |= BIT(wdev->chandef.width);
2572 case NL80211_IFTYPE_MESH_POINT:
2573 if (wdev->mesh_id_len) {
2574 - *chan = wdev->channel;
2575 + *chan = wdev->chandef.chan;
2576 *chanmode = CHAN_MODE_SHARED;
2578 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2580 + *radar_detect |= BIT(wdev->chandef.width);
2583 case NL80211_IFTYPE_MONITOR:
2584 --- a/net/wireless/mesh.c
2585 +++ b/net/wireless/mesh.c
2586 @@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
2588 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
2589 wdev->mesh_id_len = setup->mesh_id_len;
2590 - wdev->channel = setup->chandef.chan;
2591 + wdev->chandef = setup->chandef;
2595 @@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
2596 err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
2599 - wdev->channel = chandef->chan;
2600 + wdev->chandef = *chandef;
2604 @@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct
2605 err = rdev_leave_mesh(rdev, dev);
2607 wdev->mesh_id_len = 0;
2608 - wdev->channel = NULL;
2609 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2610 rdev_set_qos_map(rdev, dev, NULL);
2613 --- a/net/wireless/mlme.c
2614 +++ b/net/wireless/mlme.c
2615 @@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
2616 if (WARN_ON(!wdev->cac_started))
2619 - if (WARN_ON(!wdev->channel))
2620 + if (WARN_ON(!wdev->chandef.chan))
2624 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2625 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2626 @@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
2631 + if (is2GHz && !twiceMaxEdgePower)
2632 + twiceMaxEdgePower = 60;
2634 return twiceMaxEdgePower;
2637 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2638 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2640 #define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
2641 #define MAX_MAG_DELTA 11
2642 #define MAX_PHS_DELTA 10
2646 - int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2647 - int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2648 + int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2649 + int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2653 @@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2657 - iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
2658 + iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
2660 ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
2661 chain_idx, iqc_coeff[0]);
2662 @@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2666 - iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
2667 + iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
2669 ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
2670 chain_idx, iqc_coeff[1]);
2671 @@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
2675 -static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
2676 +static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
2680 int mp_max = -64, max_idx = 0;
2681 @@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
2683 /* find min/max mismatch across all calibrated gains */
2684 for (i = 0; i < nmeasurement; i++) {
2685 - if (mp_coeff[i] > mp_max) {
2686 - mp_max = mp_coeff[i];
2687 + if (mp_coeff[i][0] > mp_max) {
2688 + mp_max = mp_coeff[i][0];
2690 - } else if (mp_coeff[i] < mp_min) {
2691 - mp_min = mp_coeff[i];
2692 + } else if (mp_coeff[i][0] < mp_min) {
2693 + mp_min = mp_coeff[i][0];
2698 /* find average (exclude max abs value) */
2699 for (i = 0; i < nmeasurement; i++) {
2700 - if ((abs(mp_coeff[i]) < abs(mp_max)) ||
2701 - (abs(mp_coeff[i]) < abs(mp_min))) {
2702 - mp_avg += mp_coeff[i];
2703 + if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
2704 + (abs(mp_coeff[i][0]) < abs(mp_min))) {
2705 + mp_avg += mp_coeff[i][0];
2709 @@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
2713 - mp_avg = mp_coeff[nmeasurement - 1];
2714 + mp_avg = mp_coeff[nmeasurement - 1][0];
2716 /* detect outlier */
2717 if (abs(mp_max - mp_min) > max_delta) {
2718 @@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
2720 outlier_idx = min_idx;
2722 - mp_coeff[outlier_idx] = mp_avg;
2723 + mp_coeff[outlier_idx][0] = mp_avg;
2727 -static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
2728 - struct coeff *coeff,
2730 +static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
2731 + struct coeff *coeff,
2734 int i, im, nmeasurement;
2735 + int magnitude, phase;
2736 u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
2737 struct ath9k_hw_cal_data *caldata = ah->caldata;
2739 @@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
2740 if (nmeasurement > MAX_MEASUREMENT)
2741 nmeasurement = MAX_MEASUREMENT;
2743 - /* detect outlier only if nmeasurement > 1 */
2744 - if (nmeasurement > 1) {
2745 - /* Detect magnitude outlier */
2746 - ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2747 - nmeasurement, MAX_MAG_DELTA);
2749 - /* Detect phase outlier */
2750 - ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2751 - nmeasurement, MAX_PHS_DELTA);
2753 + * Skip normal outlier detection for AR9550.
2755 + if (!AR_SREV_9550(ah)) {
2756 + /* detect outlier only if nmeasurement > 1 */
2757 + if (nmeasurement > 1) {
2758 + /* Detect magnitude outlier */
2759 + ar9003_hw_detect_outlier(coeff->mag_coeff[i],
2763 + /* Detect phase outlier */
2764 + ar9003_hw_detect_outlier(coeff->phs_coeff[i],
2770 for (im = 0; im < nmeasurement; im++) {
2771 + magnitude = coeff->mag_coeff[i][im][0];
2772 + phase = coeff->phs_coeff[i][im][0];
2774 - coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
2775 - ((coeff->phs_coeff[i][im] & 0x7f) << 7);
2776 + coeff->iqc_coeff[0] =
2777 + (phase & 0x7f) | ((magnitude & 0x7f) << 7);
2780 REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
2781 @@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
2785 -static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
2786 +static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
2787 + struct coeff *coeff,
2788 + int i, int nmeasurement)
2790 + struct ath_common *common = ath9k_hw_common(ah);
2791 + int im, ix, iy, temp;
2793 + for (im = 0; im < nmeasurement; im++) {
2794 + for (ix = 0; ix < MAXIQCAL - 1; ix++) {
2795 + for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
2796 + if (coeff->mag_coeff[i][im][iy] <
2797 + coeff->mag_coeff[i][im][ix]) {
2798 + temp = coeff->mag_coeff[i][im][ix];
2799 + coeff->mag_coeff[i][im][ix] =
2800 + coeff->mag_coeff[i][im][iy];
2801 + coeff->mag_coeff[i][im][iy] = temp;
2803 + if (coeff->phs_coeff[i][im][iy] <
2804 + coeff->phs_coeff[i][im][ix]) {
2805 + temp = coeff->phs_coeff[i][im][ix];
2806 + coeff->phs_coeff[i][im][ix] =
2807 + coeff->phs_coeff[i][im][iy];
2808 + coeff->phs_coeff[i][im][iy] = temp;
2812 + coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
2813 + coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
2815 + ath_dbg(common, CALIBRATE,
2816 + "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
2818 + coeff->mag_coeff[i][im][0],
2819 + coeff->phs_coeff[i][im][0]);
2823 +static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
2824 + struct coeff *coeff,
2830 + if ((iqcal_idx + 1) != MAXIQCAL)
2833 + for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2834 + __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
2840 +static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
2844 struct ath_common *common = ath9k_hw_common(ah);
2845 const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
2846 @@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
2847 AR_PHY_CHAN_INFO_TAB_1,
2848 AR_PHY_CHAN_INFO_TAB_2,
2850 - struct coeff coeff;
2851 + static struct coeff coeff;
2855 + int nmeasurement = 0;
2856 + bool outlier_detect = true;
2858 for (i = 0; i < AR9300_MAX_CHAINS; i++) {
2859 if (!(ah->txchainmask & (1 << i)))
2860 @@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
2864 - coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
2865 - coeff.phs_coeff[i][im] =
2866 + coeff.phs_coeff[i][im][iqcal_idx] =
2867 + coeff.iqc_coeff[0] & 0x7f;
2868 + coeff.mag_coeff[i][im][iqcal_idx] =
2869 (coeff.iqc_coeff[0] >> 7) & 0x7f;
2871 - if (coeff.mag_coeff[i][im] > 63)
2872 - coeff.mag_coeff[i][im] -= 128;
2873 - if (coeff.phs_coeff[i][im] > 63)
2874 - coeff.phs_coeff[i][im] -= 128;
2875 + if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
2876 + coeff.mag_coeff[i][im][iqcal_idx] -= 128;
2877 + if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
2878 + coeff.phs_coeff[i][im][iqcal_idx] -= 128;
2881 - ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
2883 + if (AR_SREV_9550(ah))
2884 + outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
2885 + iqcal_idx, nmeasurement);
2886 + if (outlier_detect)
2887 + ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
2891 @@ -1409,7 +1484,7 @@ skip_tx_iqcal:
2895 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
2896 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
2897 else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
2898 ar9003_hw_tx_iq_cal_reload(ah);
2900 @@ -1455,14 +1530,38 @@ skip_tx_iqcal:
2904 +static bool do_ar9003_agc_cal(struct ath_hw *ah)
2906 + struct ath_common *common = ath9k_hw_common(ah);
2909 + REG_WRITE(ah, AR_PHY_AGC_CONTROL,
2910 + REG_READ(ah, AR_PHY_AGC_CONTROL) |
2911 + AR_PHY_AGC_CONTROL_CAL);
2913 + status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
2914 + AR_PHY_AGC_CONTROL_CAL,
2915 + 0, AH_WAIT_TIMEOUT);
2917 + ath_dbg(common, CALIBRATE,
2918 + "offset calibration failed to complete in %d ms,"
2919 + "noisy environment?\n",
2920 + AH_WAIT_TIMEOUT / 1000);
2927 static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
2928 struct ath9k_channel *chan)
2930 struct ath_common *common = ath9k_hw_common(ah);
2931 struct ath9k_hw_cal_data *caldata = ah->caldata;
2932 bool txiqcal_done = false;
2933 - bool is_reusable = true, status = true;
2934 + bool status = true;
2935 bool run_agc_cal = false, sep_iq_cal = false;
2938 /* Use chip chainmask only for calibration */
2939 ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
2940 @@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
2941 * AGC calibration. Specifically, AR9550 in SoC chips.
2943 if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
2944 - txiqcal_done = true;
2945 + if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
2946 + AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
2947 + txiqcal_done = true;
2949 + txiqcal_done = false;
2954 @@ -1512,27 +1616,37 @@ skip_tx_iqcal:
2955 if (AR_SREV_9330_11(ah))
2956 ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
2958 - /* Calibrate the AGC */
2959 - REG_WRITE(ah, AR_PHY_AGC_CONTROL,
2960 - REG_READ(ah, AR_PHY_AGC_CONTROL) |
2961 - AR_PHY_AGC_CONTROL_CAL);
2963 - /* Poll for offset calibration complete */
2964 - status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
2965 - AR_PHY_AGC_CONTROL_CAL,
2966 - 0, AH_WAIT_TIMEOUT);
2969 + * For non-AR9550 chips, we just trigger AGC calibration
2970 + * in the HW, poll for completion and then process
2973 + * For AR955x, we run it multiple times and use
2974 + * median IQ correction.
2976 + if (!AR_SREV_9550(ah)) {
2977 + status = do_ar9003_agc_cal(ah);
2982 - ath_dbg(common, CALIBRATE,
2983 - "offset calibration failed to complete in %d ms; noisy environment?\n",
2984 - AH_WAIT_TIMEOUT / 1000);
2987 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
2989 + if (!txiqcal_done) {
2990 + status = do_ar9003_agc_cal(ah);
2994 + for (i = 0; i < MAXIQCAL; i++) {
2995 + status = do_ar9003_agc_cal(ah);
2998 + ar9003_hw_tx_iq_cal_post_proc(ah, i, false);
3005 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
3007 /* Revert chainmask to runtime parameters */
3008 ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
3010 --- a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3011 +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3016 +#include <linux/cache.h>
3018 #include "rtl818x.h"
3021 @@ -139,7 +141,10 @@ struct rtl8187_priv {
3028 + u8 dummy1[L1_CACHE_BYTES];
3029 + } ____cacheline_aligned;
3030 struct sk_buff_head queue;
3031 } b_tx_status; /* This queue is used by both -b and non-b devices */
3032 struct mutex io_mutex;
3033 @@ -147,7 +152,8 @@ struct rtl8187_priv {
3038 + u8 dummy2[L1_CACHE_BYTES];
3039 + } *io_dmabuf ____cacheline_aligned;
3043 --- a/net/mac80211/wme.c
3044 +++ b/net/mac80211/wme.c
3045 @@ -154,6 +154,11 @@ u16 ieee80211_select_queue(struct ieee80
3046 return IEEE80211_AC_BE;
3049 + if (skb->protocol == sdata->control_port_protocol) {
3050 + skb->priority = 7;
3051 + return ieee80211_downgrade_queue(sdata, skb);
3054 /* use the data classifier to determine what 802.1d tag the
3057 --- a/drivers/net/wireless/ath/ath9k/xmit.c
3058 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3059 @@ -1444,14 +1444,16 @@ void ath_tx_aggr_sleep(struct ieee80211_
3060 for (tidno = 0, tid = &an->tid[tidno];
3061 tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
3069 ath_txq_lock(sc, txq);
3071 + if (!tid->sched) {
3072 + ath_txq_unlock(sc, txq);
3076 buffered = ath_tid_has_buffered(tid);
3079 @@ -2184,14 +2186,15 @@ int ath_tx_start(struct ieee80211_hw *hw
3080 txq->stopped = true;
3084 + tid = ath_get_skb_tid(sc, txctl->an, skb);
3086 if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
3087 ath_txq_unlock(sc, txq);
3088 txq = sc->tx.uapsdq;
3089 ath_txq_lock(sc, txq);
3090 } else if (txctl->an &&
3091 ieee80211_is_data_present(hdr->frame_control)) {
3092 - tid = ath_get_skb_tid(sc, txctl->an, skb);
3094 WARN_ON(tid->ac->txq != txctl->txq);
3096 if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
3097 --- a/drivers/net/wireless/ath/ath9k/init.c
3098 +++ b/drivers/net/wireless/ath/ath9k/init.c
3099 @@ -943,6 +943,7 @@ static void ath9k_set_hw_capab(struct at
3100 hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
3101 hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
3102 hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
3103 + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
3107 --- a/net/mac80211/ieee80211_i.h
3108 +++ b/net/mac80211/ieee80211_i.h
3109 @@ -1700,14 +1700,8 @@ void ieee80211_stop_queue_by_reason(stru
3110 void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);
3111 void ieee80211_add_pending_skb(struct ieee80211_local *local,
3112 struct sk_buff *skb);
3113 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3114 - struct sk_buff_head *skbs,
3115 - void (*fn)(void *data), void *data);
3116 -static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3117 - struct sk_buff_head *skbs)
3119 - ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
3121 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3122 + struct sk_buff_head *skbs);
3123 void ieee80211_flush_queues(struct ieee80211_local *local,
3124 struct ieee80211_sub_if_data *sdata);
3126 --- a/net/mac80211/sta_info.c
3127 +++ b/net/mac80211/sta_info.c
3128 @@ -91,7 +91,7 @@ static int sta_info_hash_del(struct ieee
3132 -static void cleanup_single_sta(struct sta_info *sta)
3133 +static void __cleanup_single_sta(struct sta_info *sta)
3136 struct tid_ampdu_tx *tid_tx;
3137 @@ -99,7 +99,8 @@ static void cleanup_single_sta(struct st
3138 struct ieee80211_local *local = sdata->local;
3141 - if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
3142 + if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
3143 + test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
3144 if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
3145 sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
3146 ps = &sdata->bss->ps;
3147 @@ -109,6 +110,7 @@ static void cleanup_single_sta(struct st
3150 clear_sta_flag(sta, WLAN_STA_PS_STA);
3151 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3153 atomic_dec(&ps->num_sta_ps);
3154 sta_info_recalc_tim(sta);
3155 @@ -139,7 +141,14 @@ static void cleanup_single_sta(struct st
3156 ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
3161 +static void cleanup_single_sta(struct sta_info *sta)
3163 + struct ieee80211_sub_if_data *sdata = sta->sdata;
3164 + struct ieee80211_local *local = sdata->local;
3166 + __cleanup_single_sta(sta);
3167 sta_info_free(local, sta);
3170 @@ -330,6 +339,7 @@ struct sta_info *sta_info_alloc(struct i
3173 spin_lock_init(&sta->lock);
3174 + spin_lock_init(&sta->ps_lock);
3175 INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
3176 INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
3177 mutex_init(&sta->ampdu_mlme.mtx);
3178 @@ -487,21 +497,26 @@ static int sta_info_insert_finish(struct
3182 - /* notify driver */
3183 - err = sta_info_insert_drv_state(local, sdata, sta);
3188 local->sta_generation++;
3191 + /* simplify things and don't accept BA sessions yet */
3192 + set_sta_flag(sta, WLAN_STA_BLOCK_BA);
3194 /* make the station visible */
3195 sta_info_hash_add(local, sta);
3197 list_add_rcu(&sta->list, &local->sta_list);
3199 + /* notify driver */
3200 + err = sta_info_insert_drv_state(local, sdata, sta);
3204 set_sta_flag(sta, WLAN_STA_INSERTED);
3205 + /* accept BA sessions now */
3206 + clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
3208 ieee80211_recalc_min_chandef(sdata);
3209 ieee80211_sta_debugfs_add(sta);
3210 @@ -522,6 +537,12 @@ static int sta_info_insert_finish(struct
3211 mesh_accept_plinks_update(sdata);
3215 + sta_info_hash_del(local, sta);
3216 + list_del_rcu(&sta->list);
3218 + synchronize_net();
3219 + __cleanup_single_sta(sta);
3221 mutex_unlock(&local->sta_mtx);
3223 @@ -1071,10 +1092,14 @@ struct ieee80211_sta *ieee80211_find_sta
3225 EXPORT_SYMBOL(ieee80211_find_sta);
3227 -static void clear_sta_ps_flags(void *_sta)
3228 +/* powersave support code */
3229 +void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3231 - struct sta_info *sta = _sta;
3232 struct ieee80211_sub_if_data *sdata = sta->sdata;
3233 + struct ieee80211_local *local = sdata->local;
3234 + struct sk_buff_head pending;
3235 + int filtered = 0, buffered = 0, ac;
3236 + unsigned long flags;
3239 if (sdata->vif.type == NL80211_IFTYPE_AP ||
3240 @@ -1085,20 +1110,6 @@ static void clear_sta_ps_flags(void *_st
3244 - clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3245 - if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
3246 - atomic_dec(&ps->num_sta_ps);
3249 -/* powersave support code */
3250 -void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3252 - struct ieee80211_sub_if_data *sdata = sta->sdata;
3253 - struct ieee80211_local *local = sdata->local;
3254 - struct sk_buff_head pending;
3255 - int filtered = 0, buffered = 0, ac;
3256 - unsigned long flags;
3258 clear_sta_flag(sta, WLAN_STA_SP);
3260 BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
3261 @@ -1109,6 +1120,8 @@ void ieee80211_sta_ps_deliver_wakeup(str
3263 skb_queue_head_init(&pending);
3265 + /* sync with ieee80211_tx_h_unicast_ps_buf */
3266 + spin_lock(&sta->ps_lock);
3267 /* Send all buffered frames to the station */
3268 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
3269 int count = skb_queue_len(&pending), tmp;
3270 @@ -1127,7 +1140,12 @@ void ieee80211_sta_ps_deliver_wakeup(str
3271 buffered += tmp - count;
3274 - ieee80211_add_pending_skbs_fn(local, &pending, clear_sta_ps_flags, sta);
3275 + ieee80211_add_pending_skbs(local, &pending);
3276 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3277 + clear_sta_flag(sta, WLAN_STA_PS_STA);
3278 + spin_unlock(&sta->ps_lock);
3280 + atomic_dec(&ps->num_sta_ps);
3282 /* This station just woke up and isn't aware of our SMPS state */
3283 if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,
3284 --- a/net/mac80211/sta_info.h
3285 +++ b/net/mac80211/sta_info.h
3286 @@ -267,6 +267,7 @@ struct ieee80211_tx_latency_stat {
3287 * @drv_unblock_wk: used for driver PS unblocking
3288 * @listen_interval: listen interval of this station, when we're acting as AP
3289 * @_flags: STA flags, see &enum ieee80211_sta_info_flags, do not use directly
3290 + * @ps_lock: used for powersave (when mac80211 is the AP) related locking
3291 * @ps_tx_buf: buffers (per AC) of frames to transmit to this station
3292 * when it leaves power saving state or polls
3293 * @tx_filtered: buffers (per AC) of frames we already tried to
3294 @@ -356,10 +357,8 @@ struct sta_info {
3295 /* use the accessors defined below */
3296 unsigned long _flags;
3299 - * STA powersave frame queues, no more than the internal
3300 - * locking required.
3302 + /* STA powersave lock and frame queues */
3303 + spinlock_t ps_lock;
3304 struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
3305 struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
3306 unsigned long driver_buffered_tids;
3307 --- a/net/mac80211/util.c
3308 +++ b/net/mac80211/util.c
3309 @@ -435,9 +435,8 @@ void ieee80211_add_pending_skb(struct ie
3310 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
3313 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3314 - struct sk_buff_head *skbs,
3315 - void (*fn)(void *data), void *data)
3316 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3317 + struct sk_buff_head *skbs)
3319 struct ieee80211_hw *hw = &local->hw;
3320 struct sk_buff *skb;
3321 @@ -461,9 +460,6 @@ void ieee80211_add_pending_skbs_fn(struc
3322 __skb_queue_tail(&local->pending[queue], skb);
3328 for (i = 0; i < hw->queues; i++)
3329 __ieee80211_wake_queue(hw, i,
3330 IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
3331 --- a/net/wireless/reg.c
3332 +++ b/net/wireless/reg.c
3333 @@ -1700,7 +1700,7 @@ static void reg_process_hint(struct regu
3335 case NL80211_REGDOM_SET_BY_USER:
3336 treatment = reg_process_hint_user(reg_request);
3337 - if (treatment == REG_REQ_OK ||
3338 + if (treatment == REG_REQ_IGNORE ||
3339 treatment == REG_REQ_ALREADY_SET)
3341 schedule_delayed_work(®_timeout, msecs_to_jiffies(3142));
3342 --- a/drivers/net/wireless/ath/ath9k/debug.c
3343 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3344 @@ -866,6 +866,12 @@ static ssize_t read_file_reset(struct fi
3345 "%17s: %2d\n", "PLL RX Hang",
3346 sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
3347 len += scnprintf(buf + len, sizeof(buf) - len,
3348 + "%17s: %2d\n", "MAC Hang",
3349 + sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
3350 + len += scnprintf(buf + len, sizeof(buf) - len,
3351 + "%17s: %2d\n", "Stuck Beacon",
3352 + sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
3353 + len += scnprintf(buf + len, sizeof(buf) - len,
3354 "%17s: %2d\n", "MCI Reset",
3355 sc->debug.stats.reset[RESET_TYPE_MCI]);
3357 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3358 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3359 @@ -868,10 +868,6 @@ static void ar9003_hw_set_rfmode(struct
3361 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
3362 rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
3363 - if (IS_CHAN_QUARTER_RATE(chan))
3364 - rfMode |= AR_PHY_MODE_QUARTER;
3365 - if (IS_CHAN_HALF_RATE(chan))
3366 - rfMode |= AR_PHY_MODE_HALF;
3368 if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
3369 REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,