1 commit 93f310a38a1d81a4bc8fcd9bf29628bd721cf2ef
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Sun Apr 6 23:35:28 2014 +0200
5 ath9k_hw: reduce ANI firstep range for older chips
7 Use 0-8 instead of 0-16, which is closer to the old implementation.
8 Also drop the overwrite of the firstep_low parameter to improve
11 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
13 commit 584d297fd29fb39c76af25ae74ff9d5fe74c8a14
14 Author: Helmut Schaa <helmut.schaa@googlemail.com>
15 Date: Wed Mar 12 10:37:55 2014 +0100
17 ath9k: Fix sequence number assignment for non-data frames
19 Since commit 558ff225de80ac95b132d3a115ddadcd64498b4f (ath9k: fix
20 ps-poll responses under a-mpdu sessions) non-data frames would have
21 gotten a sequence number from a TIDs sequence counter instead of
22 using the global sequence counter.
24 This can lead to instable connections.
26 To fix this only select the correct TID if we are processing a
27 data frame. Furthermore, prevent non-data frames to get a sequence
28 number from a TID sequence counter by adding a check to
31 Cc: Felix Fietkau <nbd@openwrt.org>
32 Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
34 commit 3a0f984b1cdcd6a9f8c441635ef3b05d58547f4e
35 Author: Felix Fietkau <nbd@openwrt.org>
36 Date: Tue Mar 11 14:03:32 2014 +0100
38 ath9k_hw: set ANI firstep as absolute values instead of relative
40 On older chips, the INI value differ in similar ways as cycpwr_thr1, so
41 convert it to absolute values as well.
43 Since the ANI algorithm is different here compared to the old
44 implementation (fewer steps, controlled at a different point in time),
45 it makes sense to use values similar to what would be applied for newer
46 chips, just without relying on INI defaults.
48 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
50 commit 91d70d40400c569b49605b78fd7c43e9405694f4
51 Author: Felix Fietkau <nbd@openwrt.org>
52 Date: Tue Mar 11 14:00:37 2014 +0100
54 ath9k_hw: set ANI cycpwr_thr1 as absolute values instead of relative
56 The table was copied from the ANI implementation of AR9300. It assumes
57 that the INI values contain a baseline value that is usable as reference
58 from which to increase/decrease based on the noise immunity value.
60 On older chips, the differences are bigger and especially AR5008/AR9001
61 are configured to much more sensitive values than what is useful.
63 Improve ANI behavior by reverting to the absolute values used in the
64 previous implementation (expressed as a simple formula instead of the
67 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
69 commit c977493766310a825f406836636ffd66e1447783
70 Author: Felix Fietkau <nbd@openwrt.org>
71 Date: Mon Mar 10 19:52:56 2014 +0100
73 ath9k_hw: remove ANI function restrictions for AP mode
75 The primary purpose of this piece of code was to selectively disable
76 OFDM weak signal detection. The checks for this are elsewhere, and an
77 earlier commit relaxed the restrictions for older chips, which are more
78 sensitive to interference.
80 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
82 commit 8d804f1af11e4e058b1e8453327777d73a585cb8
83 Author: Felix Fietkau <nbd@openwrt.org>
84 Date: Sun Mar 9 11:25:43 2014 +0100
86 ath9k: clean up and enhance ANI debugfs file
88 Unify scnprintf calls and include the current OFDM/CCK immunity level.
90 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
92 commit 22e298b5a3a8a49e33805d4e351965123dede35b
93 Author: Felix Fietkau <nbd@openwrt.org>
94 Date: Sun Mar 9 10:58:47 2014 +0100
96 ath9k: fix ready time of the multicast buffer queue
98 qi->tqi_readyTime is written directly to registers that expect
99 microseconds as unit instead of TU.
100 When setting the CABQ ready time, cur_conf->beacon_interval is in TU, so
101 convert it to microseconds before passing it to ath9k_hw.
103 This should hopefully fix some Tx DMA issues with buffered multicast
106 Cc: stable@vger.kernel.org
107 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
109 commit fcb064fdd5a27bec8d24099bc0172468f34c97cb
110 Author: Felix Fietkau <nbd@openwrt.org>
111 Date: Sun Mar 9 09:43:09 2014 +0100
113 ath9k_hw: fix unreachable code in baseband hang detection code
115 The commit "ath9k: reduce baseband hang detection false positive rate"
116 added a delay in the loop checking the baseband state, however it was
117 unreachable due to previous 'continue' statements.
119 Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
120 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
122 commit 31959d8df39319e32c6d5ba9c135727be90cfad7
123 Author: Michal Kazior <michal.kazior@tieto.com>
124 Date: Fri Mar 7 08:09:38 2014 +0100
126 mac80211: fix possible NULL dereference
128 If chanctx is missing on a given vif then the band
129 is assumed to be 2GHz. However if hw doesn't
130 support 2GHz band then mac80211 ended up with a
135 [ 4605.207223] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
136 [ 4605.210789] IP: [<ffffffffa07b5635>] ieee80211_parse_bitrates+0x65/0x110 [mac80211]
138 The splat was preceeded by WARN_ON(!chanctx_conf)
139 in ieee80211_get_sdata_band().
141 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
143 commit 6c5a3ffa0a2d22c091a2717f427259bacf77ac5e
144 Author: Michael Braun <michael-dev@fami-braun.de>
145 Date: Thu Mar 6 15:08:43 2014 +0100
147 mac80211: fix WPA with VLAN on AP side with ps-sta again
149 commit de74a1d9032f4d37ea453ad2a647e1aff4cd2591
150 "mac80211: fix WPA with VLAN on AP side with ps-sta"
151 fixed an issue where queued multicast packets would
152 be sent out encrypted with the key of an other bss.
154 commit "7cbf9d017dbb5e3276de7d527925d42d4c11e732"
155 "mac80211: fix oops on mesh PS broadcast forwarding"
156 essentially reverted it, because vif.type cannot be AP_VLAN
157 due to the check to vif.type in ieee80211_get_buffered_bc before.
159 As the later commit intended to fix the MESH case, fix it
160 by checking for IFTYPE_AP instead of IFTYPE_AP_VLAN.
163 Cc: <stable@vger.kernel.org> # 3.10.x
164 Cc: <stable@vger.kernel.org> # 3.11.x
165 Cc: <stable@vger.kernel.org> # 3.12.x
166 Cc: <stable@vger.kernel.org> # 3.13.x
167 Cc: <linux-wireless@vger.kernel.org>
168 Cc: <projekt-wlan@fem.tu-ilmenau.de>
169 Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
171 commit 9d6ab9bdb9b368a6cf9519f0f92509b5b2c297ec
172 Author: Johannes Berg <johannes.berg@intel.com>
173 Date: Mon Mar 3 14:19:08 2014 +0100
175 cfg80211: remove racy beacon_interval assignment
177 In case of AP mode, the beacon interval is already reset to
178 zero inside cfg80211_stop_ap(), and in the other modes it
179 isn't relevant. Remove the assignment to remove a potential
180 race since the assignment isn't properly locked.
182 Reported-by: Michal Kazior <michal.kazior@tieto.com>
183 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
185 commit 1abdeca3c6fb9cf1f84f85e78ed8d1c33bd69db0
186 Author: Felix Fietkau <nbd@openwrt.org>
187 Date: Fri Feb 28 18:52:56 2014 +0100
189 ath9k_hw: tweak noise immunity thresholds for older chipsets
191 Older chipsets are more sensitive to high PHY error counts, and the
192 current noise immunity thresholds were based on tests run at QCA with
195 This patch brings back the values from the old ANI implementation for
196 old chipsets, and it also disables weak signal detection on an earlier
197 noise immunity level, to improve overall radio stability on affected
200 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
202 commit 431e506da5953adc3b65af25f4b90873d528c115
203 Author: Felix Fietkau <nbd@openwrt.org>
204 Date: Fri Feb 28 18:44:13 2014 +0100
206 ath9k_hw: toggle weak signal detection in AP mode on older chipsets
208 The commit 80b4205b "ath9k: Fix OFDM weak signal detection for AP mode"
209 prevented weak signal detection changes from taking effect in AP mode on
210 all chipsets, claiming it is "not allowed".
212 The main reason for not disabling weak signal detection in AP mode is
213 that typically beacon RSSI is used to track whether it is needed to
214 boost range, and this is unavailable in AP mode for obvious reasons.
216 The problem with not disabling weak signal detection is that older
217 chipsets are very sensitive to high PHY error counts. When faced with
218 heavy noise, this can lead to an excessive amount of "Failed to stop
219 TX DMA" errors in the field.
221 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
223 commit 98d1a6c5b14688ed030e81b889f607be308e0df9
224 Author: Felix Fietkau <nbd@openwrt.org>
225 Date: Mon Feb 24 22:20:32 2014 +0100
227 ath9k: fix invalid descriptor discarding
229 Only set sc->rx.discard_next to rx_stats->rs_more when actually
230 discarding the current descriptor.
232 Also, fix a detection of broken descriptors:
233 First the code checks if the current descriptor is not done.
234 Then it checks if the next descriptor is done.
235 Add a check that afterwards checks the first descriptor again, because
236 it might have been completed in the mean time.
238 This fixes a regression introduced in
239 commit 723e711356b5a8a95728a890e254e8b0d47b55cf
240 "ath9k: fix handling of broken descriptors"
242 Cc: stable@vger.kernel.org
243 Reported-by: Marco André Dinis <marcoandredinis@gmail.com>
244 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
246 commit 52a46300e782fe6994466523eb2b0b59091ea59f
247 Author: Felix Fietkau <nbd@openwrt.org>
248 Date: Mon Feb 24 11:43:50 2014 +0100
250 ath9k: reduce baseband hang detection false positive rate
252 Check if the baseband state remains stable, and add a small delay
253 between register reads.
255 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
257 commit 118945bb12082e9d4edddc868d88143164e0f440
258 Author: Felix Fietkau <nbd@openwrt.org>
259 Date: Sat Feb 22 14:55:23 2014 +0100
261 ath5k: set SURVEY_INFO_IN_USE on get_survey
263 Only one channel is returned - the one currently being used.
265 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
267 commit ee41f72476e1ea44283dfe1cbf75b9543a1e15c8
268 Author: Felix Fietkau <nbd@openwrt.org>
269 Date: Sat Feb 22 14:44:52 2014 +0100
271 ath9k: make some hardware reset log messages debug-only
273 On some chips, baseband watchdog hangs are more common than others, and
274 the driver has support for handling them.
275 Interrupts even after a watchdog hang are also quite common, so there's
276 not much point in spamming the user's logfiles.
278 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
280 commit b14fbb554fc65a2e0b5c41a319269b0350f187e7
281 Author: Felix Fietkau <nbd@openwrt.org>
282 Date: Sat Feb 22 14:35:25 2014 +0100
284 ath9k: do not set half/quarter channel flags in AR_PHY_MODE
286 5/10 MHz channel bandwidth is configured via the PLL clock, instead of
287 the AR_PHY_MODE register. Using that register is AR93xx specific, and
288 makes the mode incompatible with earlier chipsets.
290 In some early versions, these flags were apparently applied at the wrong
291 point in time and thus did not cause connectivity issues, however now
292 they are causing problems, as pointed out in this OpenWrt ticket:
294 https://dev.openwrt.org/ticket/14916
296 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
298 commit 0f1cb7be2551b30b02cd54c897e0e29e483cfda5
299 Author: Felix Fietkau <nbd@openwrt.org>
300 Date: Sat Feb 22 13:43:29 2014 +0100
302 ath9k: fix ps-poll responses under a-mpdu sessions
304 When passing tx frames to the U-APSD queue for powersave poll responses,
305 the ath_atx_tid pointer needs to be passed to ath_tx_setup_buffer for
306 proper sequence number accounting.
308 This fixes high latency and connection stability issues with ath9k
309 running as AP and a few kinds of mobile phones as client, when PS-Poll
312 Cc: stable@vger.kernel.org
313 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
315 commit d5d87a37bbd6066b2c3c5d0bd0fe2a6e2ea45cc5
316 Author: Felix Fietkau <nbd@openwrt.org>
317 Date: Fri Feb 21 11:39:59 2014 +0100
319 ath9k: list more reset causes in debugfs
321 Number of MAC hangs and stuck beacons were missing
323 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
325 commit d84856012e0f10fe598a5ad3b7b869397a089e07
326 Author: Johannes Berg <johannes.berg@intel.com>
327 Date: Thu Feb 20 11:19:58 2014 +0100
329 mac80211: fix station wakeup powersave race
331 Consider the following (relatively unlikely) scenario:
332 1) station goes to sleep while frames are buffered in driver
333 2) driver blocks wakeup (until no more frames are buffered)
334 3) station wakes up again
335 4) driver unblocks wakeup
337 In this case, the current mac80211 code will do the following:
338 1) WLAN_STA_PS_STA set
339 2) WLAN_STA_PS_DRIVER set
341 4) WLAN_STA_PS_DRIVER cleared
343 As a result, no frames will be delivered to the client, even
344 though it is awake, until it sends another frame to us that
345 triggers ieee80211_sta_ps_deliver_wakeup() in sta_ps_end().
347 Since we now take the PS spinlock, we can fix this while at
348 the same time removing the complexity with the pending skb
349 queue function. This was broken since my commit 50a9432daeec
350 ("mac80211: fix powersaving clients races") due to removing
351 the clearing of WLAN_STA_PS_STA in the RX path.
353 While at it, fix a cleanup path issue when a station is
354 removed while the driver is still blocking its wakeup.
356 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
358 commit 798f2786602cbe93e6b928299614aa36ebf50692
359 Author: Johannes Berg <johannes.berg@intel.com>
360 Date: Mon Feb 17 20:49:03 2014 +0100
362 mac80211: insert stations before adding to driver
364 There's a race condition in mac80211 because we add stations
365 to the internal lists after adding them to the driver, which
366 means that (for example) the following can happen:
367 1. a station connects and is added
368 2. first, it is added to the driver
369 3. then, it is added to the mac80211 lists
371 If the station goes to sleep between steps 2 and 3, and the
372 firmware/hardware records it as being asleep, mac80211 will
373 never instruct the driver to wake it up again as it never
374 realized it went to sleep since the RX path discarded the
375 frame as a "spurious class 3 frame", no station entry was
378 Fix this by adding the station in software first, and only
379 then adding it to the driver. That way, any state that the
380 driver changes will be reflected properly in mac80211's
381 station state. The problematic part is the roll-back if the
382 driver fails to add the station, in that case a bit more is
383 needed. To not make that overly complex prevent starting BA
384 sessions in the meantime.
386 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
388 commit b9ba6a520cb07ab3aa7aaaf9ce4a0bc7a6bc06fe
389 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
390 Date: Thu Feb 20 09:22:11 2014 +0200
392 mac80211: fix AP powersave TX vs. wakeup race
394 There is a race between the TX path and the STA wakeup: while
395 a station is sleeping, mac80211 buffers frames until it wakes
396 up, then the frames are transmitted. However, the RX and TX
397 path are concurrent, so the packet indicating wakeup can be
398 processed while a packet is being transmitted.
400 This can lead to a situation where the buffered frames list
401 is emptied on the one side, while a frame is being added on
402 the other side, as the station is still seen as sleeping in
405 As a result, the newly added frame will not be send anytime
406 soon. It might be sent much later (and out of order) when the
407 station goes to sleep and wakes up the next time.
409 Additionally, it can lead to the crash below.
411 Fix all this by synchronising both paths with a new lock.
412 Both path are not fastpath since they handle PS situations.
414 In a later patch we'll remove the extra skb queue locks to
415 reduce locking overhead.
417 BUG: unable to handle kernel
418 NULL pointer dereference at 000000b0
419 IP: [<ff6f1791>] ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
421 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
422 EIP: 0060:[<ff6f1791>] EFLAGS: 00210282 CPU: 1
423 EIP is at ieee80211_report_used_skb+0x11/0x3e0 [mac80211]
424 EAX: e5900da0 EBX: 00000000 ECX: 00000001 EDX: 00000000
425 ESI: e41d00c0 EDI: e5900da0 EBP: ebe458e4 ESP: ebe458b0
426 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
427 CR0: 8005003b CR2: 000000b0 CR3: 25a78000 CR4: 000407d0
428 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
429 DR6: ffff0ff0 DR7: 00000400
430 Process iperf (pid: 3934, ti=ebe44000 task=e757c0b0 task.ti=ebe44000)
431 iwlwifi 0000:02:00.0: I iwl_pcie_enqueue_hcmd Sending command LQ_CMD (#4e), seq: 0x0903, 92 bytes at 3[3]:9
433 e403b32c ebe458c4 00200002 00200286 e403b338 ebe458cc c10960bb e5900da0
434 ff76a6ec ebe458d8 00000000 e41d00c0 e5900da0 ebe458f0 ff6f1b75 e403b210
435 ebe4598c ff723dc1 00000000 ff76a6ec e597c978 e403b758 00000002 00000002
437 [<ff6f1b75>] ieee80211_free_txskb+0x15/0x20 [mac80211]
438 [<ff723dc1>] invoke_tx_handlers+0x1661/0x1780 [mac80211]
439 [<ff7248a5>] ieee80211_tx+0x75/0x100 [mac80211]
440 [<ff7249bf>] ieee80211_xmit+0x8f/0xc0 [mac80211]
441 [<ff72550e>] ieee80211_subif_start_xmit+0x4fe/0xe20 [mac80211]
442 [<c149ef70>] dev_hard_start_xmit+0x450/0x950
443 [<c14b9aa9>] sch_direct_xmit+0xa9/0x250
444 [<c14b9c9b>] __qdisc_run+0x4b/0x150
445 [<c149f732>] dev_queue_xmit+0x2c2/0xca0
447 Cc: stable@vger.kernel.org
448 Reported-by: Yaara Rozenblum <yaara.rozenblum@intel.com>
449 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
450 Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
451 [reword commit log, use a separate lock]
452 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
454 commit 80e419de0dff38436b30d363311c625766193f86
455 Author: Inbal Hacohen <Inbal.Hacohen@intel.com>
456 Date: Wed Feb 12 09:32:27 2014 +0200
458 cfg80211: bugfix in regulatory user hint process
460 After processing hint_user, we would want to schedule the
461 timeout work only if we are actually waiting to CRDA. This happens
462 when the status is not "IGNORE" nor "ALREADY_SET".
464 Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
465 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
467 commit 6514c93afede55284e2cb63359aadedb85884c80
468 Author: Jouni Malinen <jouni@qca.qualcomm.com>
469 Date: Tue Feb 18 20:41:08 2014 +0200
471 ath9k: Enable U-APSD AP mode support
473 mac80211 handles the actual operations, so ath9k can just indicate
474 support for this. Based on initial tests, this combination seems to
477 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
479 commit a63caf0a357ad5c1f08d6b7827dc76c451445017
480 Author: Stanislaw Gruszka <sgruszka@redhat.com>
481 Date: Wed Feb 19 13:15:17 2014 +0100
483 ath9k: protect tid->sched check
485 We check tid->sched without a lock taken on ath_tx_aggr_sleep(). That
486 is race condition which can result of doing list_del(&tid->list) twice
487 (second time with poisoned list node) and cause crash like shown below:
489 [424271.637220] BUG: unable to handle kernel paging request at 00100104
490 [424271.637328] IP: [<f90fc072>] ath_tx_aggr_sleep+0x62/0xe0 [ath9k]
492 [424271.639953] Call Trace:
493 [424271.639998] [<f90f6900>] ? ath9k_get_survey+0x110/0x110 [ath9k]
494 [424271.640083] [<f90f6942>] ath9k_sta_notify+0x42/0x50 [ath9k]
495 [424271.640177] [<f809cfef>] sta_ps_start+0x8f/0x1c0 [mac80211]
496 [424271.640258] [<c10f730e>] ? free_compound_page+0x2e/0x40
497 [424271.640346] [<f809e915>] ieee80211_rx_handlers+0x9d5/0x2340 [mac80211]
498 [424271.640437] [<c112f048>] ? kmem_cache_free+0x1d8/0x1f0
499 [424271.640510] [<c1345a84>] ? kfree_skbmem+0x34/0x90
500 [424271.640578] [<c10fc23c>] ? put_page+0x2c/0x40
501 [424271.640640] [<c1345a84>] ? kfree_skbmem+0x34/0x90
502 [424271.640706] [<c1345a84>] ? kfree_skbmem+0x34/0x90
503 [424271.640787] [<f809dde3>] ? ieee80211_rx_handlers_result+0x73/0x1d0 [mac80211]
504 [424271.640897] [<f80a07a0>] ieee80211_prepare_and_rx_handle+0x520/0xad0 [mac80211]
505 [424271.641009] [<f809e22d>] ? ieee80211_rx_handlers+0x2ed/0x2340 [mac80211]
506 [424271.641104] [<c13846ce>] ? ip_output+0x7e/0xd0
507 [424271.641182] [<f80a1057>] ieee80211_rx+0x307/0x7c0 [mac80211]
508 [424271.641266] [<f90fa6ee>] ath_rx_tasklet+0x88e/0xf70 [ath9k]
509 [424271.641358] [<f80a0f2c>] ? ieee80211_rx+0x1dc/0x7c0 [mac80211]
510 [424271.641445] [<f90f82db>] ath9k_tasklet+0xcb/0x130 [ath9k]
513 https://bugzilla.kernel.org/show_bug.cgi?id=70551
515 Reported-and-tested-by: Max Sydorenko <maxim.stargazer@gmail.com>
516 Cc: stable@vger.kernel.org
517 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
519 commit 82ed9e3ccc02797df2ffe4b78127c4cd5f799a41
520 Author: Felix Fietkau <nbd@openwrt.org>
521 Date: Tue Feb 11 15:54:13 2014 +0100
523 mac80211: send control port protocol frames to the VO queue
525 Improves reliability of wifi connections with WPA, since authentication
526 frames are prioritized over normal traffic and also typically exempt
529 Cc: stable@vger.kernel.org
530 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
532 commit d4426800f71e972feaa33e04c5801fc730627bdd
533 Author: Stanislaw Gruszka <stf_xl@wp.pl>
534 Date: Mon Feb 10 22:38:28 2014 +0100
536 rtl8187: fix regression on MIPS without coherent DMA
538 This patch fixes regression caused by commit a16dad77634 "MIPS: Fix
539 potencial corruption". That commit fixes one corruption scenario in
540 cost of adding another one, which actually start to cause crashes
541 on Yeeloong laptop when rtl8187 driver is used.
543 For correct DMA read operation on machines without DMA coherence, kernel
544 have to invalidate cache, such it will refill later with new data that
545 device wrote to memory, when that data is needed to process. We can only
546 invalidate full cache line. Hence when cache line includes both dma
547 buffer and some other data (written in cache, but not yet in main
548 memory), the other data can not hit memory due to invalidation. That
549 happen on rtl8187 where struct rtl8187_priv fields are located just
550 before and after small buffers that are passed to USB layer and DMA
551 is performed on them.
553 To fix the problem we align buffers and reserve space after them to make
554 them match cache line.
556 This patch does not resolve all possible MIPS problems entirely, for
557 that we have to assure that we always map cache aligned buffers for DMA,
558 what can be complex or even not possible. But patch fixes visible and
559 reproducible regression and seems other possible corruptions do not
560 happen in practice, since Yeeloong laptop works stable without rtl8187
564 https://bugzilla.kernel.org/show_bug.cgi?id=54391
566 Reported-by: Petr Pisar <petr.pisar@atlas.cz>
567 Bisected-by: Tom Li <biergaizi2009@gmail.com>
568 Reported-and-tested-by: Tom Li <biergaizi2009@gmail.com>
569 Cc: stable@vger.kernel.org
570 Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
572 commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
573 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
574 Date: Fri Feb 7 10:29:55 2014 +0530
576 ath9k: Calculate IQ-CAL median
578 This patch adds a routine to calculate the median IQ correction
579 values for AR955x, which is used for outlier detection.
580 The normal method which is used for all other chips is
583 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
585 commit c52a6fce0820c8d0687443ab86058ae03b478c8f
586 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
587 Date: Fri Feb 7 10:29:54 2014 +0530
589 ath9k: Expand the IQ coefficient array
591 This will be used for storing data for mutiple
592 IQ calibration runs, for AR955x.
594 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
596 commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
597 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
598 Date: Fri Feb 7 10:29:53 2014 +0530
600 ath9k: Modify IQ calibration for AR955x
602 IQ calibration post-processing for AR955x is different
603 from other chips - instead of just doing it as part
604 of AGC calibration once, it is triggered 3 times and
605 a median is determined. This patch adds initial support
606 for changing the calibration behavior for AR955x.
608 Also, to simplify things, a helper routine to issue/poll
609 AGC calibration is used.
611 For non-AR955x chips, the iqcal_idx (which will be used
612 in subsequent patches) is set to zero.
614 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
616 commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
617 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
618 Date: Fri Feb 7 10:29:52 2014 +0530
620 ath9k: Fix magnitude/phase calculation
622 Incorrect values are programmed in the registers
623 containing the IQ correction coefficients by the IQ-CAL
624 post-processing code. Fix this.
626 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
628 commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
629 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
630 Date: Fri Feb 7 10:29:51 2014 +0530
632 ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
634 Use ar9003_hw_tx_iq_cal_outlier_detection instead.
636 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
638 commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
639 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
640 Date: Fri Feb 7 10:29:50 2014 +0530
642 ath9k: Check explicitly for IQ calibration
644 In chips like AR955x, the initvals contain the information
645 whether IQ calibration is to be done in the HW when an
646 AGC calibration is triggered. Check if IQ-CAL is enabled
647 in the initvals before flagging 'txiqcal_done' as true.
649 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
651 commit cb4969634b93c4643a32cc3fbd27d2b288b25771
652 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
653 Date: Fri Feb 7 10:29:49 2014 +0530
655 ath9k: Fix IQ cal post processing for SoC
657 Calibration data is not reused for SoC chips, so
658 call ar9003_hw_tx_iq_cal_post_proc() with the correct
659 argument. The 'is_reusable' flag is currently used
660 only for PC-OEM chips, but it makes things clearer to
661 specify it explicity.
663 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
665 commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
666 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
667 Date: Mon Feb 3 13:31:37 2014 +0530
669 ath9k: Fix TX power calculation
671 The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
672 fixed the incorrect values in the eeprom templates, but if
673 boards have already been calibrated with incorrect values,
674 they would still be using the wrong TX power. Fix this by assigning
675 a default value in such cases.
677 Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
678 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
680 commit b9f268b5b01331c3c82179abca551429450e9417
681 Author: Michal Kazior <michal.kazior@tieto.com>
682 Date: Wed Jan 29 14:22:27 2014 +0100
684 cfg80211: consider existing DFS interfaces
686 It was possible to break interface combinations in
689 combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
690 combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
692 With the above interface combinations it was
695 step 1. start AP on DFS channel by matching combo 2
696 step 2. start AP on non-DFS channel by matching combo 1
698 This was possible beacuse (step 2) did not consider
699 if other interfaces require radar detection.
701 The patch changes how cfg80211 tracks channels -
702 instead of channel itself now a complete chandef
705 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
706 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
708 commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
709 Author: Antonio Quartulli <antonio@open-mesh.com>
710 Date: Wed Jan 29 17:53:43 2014 +0100
712 cfg80211: fix channel configuration in IBSS join
714 When receiving an IBSS_JOINED event select the BSS object
715 based on the {bssid, channel} couple rather than the bssid
717 With the current approach if another cell having the same
718 BSSID (but using a different channel) exists then cfg80211
719 picks up the wrong BSS object.
720 The result is a mismatching channel configuration between
721 cfg80211 and the driver, that can lead to any sort of
724 The issue can be triggered by having an IBSS sitting on
725 given channel and then asking the driver to create a new
726 cell using the same BSSID but with a different frequency.
727 By passing the channel to cfg80211_get_bss() we can solve
728 this ambiguity and retrieve/create the correct BSS object.
729 All the users of cfg80211_ibss_joined() have been changed
732 Moreover WARN when cfg80211_ibss_joined() gets a NULL
733 channel as argument and remove a bogus call of the same
734 function in ath6kl (it does not make sense to call
735 cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
737 Cc: Kalle Valo <kvalo@qca.qualcomm.com>
738 Cc: Arend van Spriel <arend@broadcom.com>
739 Cc: Bing Zhao <bzhao@marvell.com>
740 Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
741 Cc: libertas-dev@lists.infradead.org
742 Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
743 Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
744 [minor code cleanup in ath6kl]
745 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
747 commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
748 Author: Johannes Berg <johannes.berg@intel.com>
749 Date: Fri Jan 24 14:41:44 2014 +0100
751 mac80211: fix bufferable MMPDU RX handling
753 Action, disassoc and deauth frames are bufferable, and as such don't
754 have the PM bit in the frame control field reserved which means we
755 need to react to the bit when receiving in such a frame.
757 Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
758 and using it for the RX path that currently ignores the PM bit in
759 any non-data frames for doze->wake transitions, but listens to it in
760 all frames for wake->doze transitions, both of which are wrong.
762 Also use the new helper in the TX path to clean up the code.
764 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
766 commit fc0df6d2343636e3f48a069330d5b972e3d8659d
767 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
768 Date: Fri Jan 24 14:29:21 2014 +0100
770 cfg80211: set preset_chandef after channel switch
772 Set preset_chandef in channel switch notification.
773 In other case we will have old preset_chandef.
775 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
776 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
778 commit cdec895e2344987ff171cece96e25d7407a3ebf6
779 Author: Simon Wunderlich <simon@open-mesh.com>
780 Date: Fri Jan 24 23:48:29 2014 +0100
782 mac80211: send ibss probe responses with noack flag
784 Responding to probe requests for scanning clients will often create
785 excessive retries, as it happens quite often that the scanning client
786 already left the channel. Therefore do it like hostapd and send probe
787 responses for wildcard SSID only once by using the noack flag.
789 Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
790 [fix typo & 'wildcard SSID' in commit log]
791 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
793 commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
794 Author: Luciano Coelho <luciano.coelho@intel.com>
795 Date: Tue Jan 28 17:09:08 2014 +0200
797 mac80211: ibss: remove unnecessary call to release channel
799 The ieee80211_vif_use_channel() function calls
800 ieee80211_vif_release_channel(), so there's no need to call it
801 explicitly in __ieee80211_sta_join_ibss().
803 Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
804 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
806 commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
807 Author: Michal Kazior <michal.kazior@tieto.com>
808 Date: Wed Jan 29 07:56:21 2014 +0100
810 mac80211: add missing CSA locking
812 The patch adds a missing sdata lock and adds a few
813 lockdeps for easier maintenance.
815 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
816 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
818 commit ad17ba7d14d225b109b73c177cd446afb8050598
819 Author: Michal Kazior <michal.kazior@tieto.com>
820 Date: Wed Jan 29 07:56:20 2014 +0100
822 mac80211: fix sdata->radar_required locking
824 radar_required setting wasn't protected by
825 local->mtx in some places. This should prevent
826 from scanning/radar detection/roc colliding.
828 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
829 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
831 commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
832 Author: Michal Kazior <michal.kazior@tieto.com>
833 Date: Wed Jan 29 07:56:19 2014 +0100
835 mac80211: move csa_active setting in STA CSA
837 The sdata->vif.csa_active could be left set after,
838 e.g. channel context constraints check fail in STA
839 mode leaving the interface in a strange state for
840 a brief period of time until it is disconnected.
841 This was harmless but ugly.
843 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
844 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
845 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
847 commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
848 Author: Michal Kazior <michal.kazior@tieto.com>
849 Date: Wed Jan 29 07:56:18 2014 +0100
851 mac80211: fix possible memory leak on AP CSA failure
853 If CSA for AP interface failed and the interface
854 was not stopped afterwards another CSA request
855 would leak sdata->u.ap.next_beacon.
857 Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
858 Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
859 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
861 commit 3a77ba08940682bf3d52cf14f980337324af9d4a
862 Author: Johannes Berg <johannes.berg@intel.com>
863 Date: Sat Feb 1 00:33:29 2014 +0100
865 mac80211: fix fragmentation code, particularly for encryption
867 The "new" fragmentation code (since my rewrite almost 5 years ago)
868 erroneously sets skb->len rather than using skb_trim() to adjust
869 the length of the first fragment after copying out all the others.
870 This leaves the skb tail pointer pointing to after where the data
871 originally ended, and thus causes the encryption MIC to be written
872 at that point, rather than where it belongs: immediately after the
875 The impact of this is that if software encryption is done, then
876 a) encryption doesn't work for the first fragment, the connection
877 becomes unusable as the first fragment will never be properly
878 verified at the receiver, the MIC is practically guaranteed to
880 b) we leak up to 8 bytes of plaintext (!) of the packet out into
883 This is only mitigated by the fact that many devices are capable
884 of doing encryption in hardware, in which case this can't happen
885 as the tail pointer is irrelevant in that case. Additionally,
886 fragmentation is not used very frequently and would normally have
887 to be configured manually.
889 Fix this by using skb_trim() properly.
891 Cc: stable@vger.kernel.org
892 Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
893 Reported-by: Jouni Malinen <j@w1.fi>
894 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
896 commit de5f242e0c10e841017e37eb8c38974a642dbca8
897 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
898 Date: Tue Jan 28 06:21:59 2014 +0530
900 ath9k: Fix build error on ARM
902 Use mdelay instead of udelay to fix this error:
904 ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
905 make[1]: *** [__modpost] Error 1
906 make: *** [modules] Error 2
908 Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
909 Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
911 commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
912 Author: Geert Uytterhoeven <geert@linux-m68k.org>
913 Date: Sun Jan 26 11:53:21 2014 +0100
915 ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
917 drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
918 drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
920 Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
921 optimize ath9k_flush").
923 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
925 commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
926 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
927 Date: Mon Jan 27 11:07:42 2014 +0200
929 mac80211: release the channel in error path in start_ap
931 When the driver cannot start the AP or when the assignement
932 of the beacon goes wrong, we need to unassign the vif.
934 Cc: stable@vger.kernel.org
935 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
936 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
938 commit dfb6889a75c601aedb7450b7e606668e77da6679
939 Author: Johannes Berg <johannes.berg@intel.com>
940 Date: Wed Jan 22 11:14:19 2014 +0200
942 cfg80211: send scan results from work queue
944 Due to the previous commit, when a scan finishes, it is in theory
945 possible to hit the following sequence:
946 1. interface starts being removed
947 2. scan is cancelled by driver and cfg80211 is notified
948 3. scan done work is scheduled
949 4. interface is removed completely, rdev->scan_req is freed,
950 event sent to userspace but scan done work remains pending
951 5. new scan is requested on another virtual interface
952 6. scan done work runs, freeing the still-running scan
954 To fix this situation, hang on to the scan done message and block
955 new scans while that is the case, and only send the message from
956 the work function, regardless of whether the scan_req is already
957 freed from interface removal. This makes step 5 above impossible
958 and changes step 6 to be
959 5. scan done work runs, sending the scan done message
961 As this can't work for wext, so we send the message immediately,
962 but this shouldn't be an issue since we still return -EBUSY.
964 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
966 commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
967 Author: Johannes Berg <johannes.berg@intel.com>
968 Date: Wed Jan 22 11:14:18 2014 +0200
970 cfg80211: fix scan done race
972 When an interface/wdev is removed, any ongoing scan should be
973 cancelled by the driver. This will make it call cfg80211, which
974 only queues a work struct. If interface/wdev removal is quick
975 enough, this can leave the scan request pending and processed
976 only after the interface is gone, causing a use-after-free.
978 Fix this by making sure the scan request is not pending after
979 the interface is destroyed. We can't flush or cancel the work
980 item due to locking concerns, but when it'll run it shouldn't
981 find anything to do. This leaves a potential issue, if a new
982 scan gets requested before the work runs, it prematurely stops
983 the running scan, potentially causing another crash. I'll fix
984 that in the next patch.
986 This was particularly observed with P2P_DEVICE wdevs, likely
987 because freeing them is quicker than freeing netdevs.
989 Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
990 Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
991 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
993 commit ae04fa489ab31b5a10d3cc8399f52761175d4321
994 Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
995 Date: Thu Jan 23 14:28:16 2014 +0200
997 mac80211: avoid deadlock revealed by lockdep
999 sdata->u.ap.request_smps_work can’t be flushed synchronously
1000 under wdev_lock(wdev) since ieee80211_request_smps_ap_work
1001 itself locks the same lock.
1002 While at it, reset the driver_smps_mode when the ap is
1003 stopped to its default: OFF.
1007 ======================================================
1008 [ INFO: possible circular locking dependency detected ]
1009 3.12.0-ipeer+ #2 Tainted: G O
1010 -------------------------------------------------------
1011 rmmod/2867 is trying to acquire lock:
1012 ((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
1014 but task is already holding lock:
1015 (&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
1017 which lock already depends on the new lock.
1019 the existing dependency chain (in reverse order) is:
1021 -> #1 (&wdev->mtx){+.+.+.}:
1022 [<c10aefa9>] lock_acquire+0x79/0xe0
1023 [<c1607a1a>] mutex_lock_nested+0x4a/0x360
1024 [<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
1025 [<c105cdd8>] process_one_work+0x198/0x450
1026 [<c105d469>] worker_thread+0xf9/0x320
1027 [<c10669ff>] kthread+0x9f/0xb0
1028 [<c1613397>] ret_from_kernel_thread+0x1b/0x28
1030 -> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
1031 [<c10ae9df>] __lock_acquire+0x183f/0x1910
1032 [<c10aefa9>] lock_acquire+0x79/0xe0
1033 [<c105b917>] flush_work+0x47/0x90
1034 [<c105d867>] __cancel_work_timer+0x67/0xe0
1035 [<c105d90f>] cancel_work_sync+0xf/0x20
1036 [<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
1037 [<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
1038 [<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
1039 [<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
1040 [<c160f2c9>] notifier_call_chain+0x59/0x130
1041 [<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
1042 [<c106c70f>] raw_notifier_call_chain+0x1f/0x30
1043 [<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
1044 [<c14f8263>] call_netdevice_notifiers+0x13/0x20
1045 [<c14f82a4>] __dev_close_many+0x34/0xb0
1046 [<c14f83fe>] dev_close_many+0x6e/0xc0
1047 [<c14f9c77>] rollback_registered_many+0xa7/0x1f0
1048 [<c14f9dd4>] unregister_netdevice_many+0x14/0x60
1049 [<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
1050 [<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
1051 [<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
1052 [<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
1053 [<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
1054 [<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
1055 [<c10b8bf9>] SyS_delete_module+0x179/0x2b0
1056 [<c1613421>] sysenter_do_call+0x12/0x32
1058 Fixes: 687da132234f ("mac80211: implement SMPS for AP")
1059 Cc: <stable@vger.kernel.org> [3.13]
1060 Reported-by: Ilan Peer <ilan.peer@intel.com>
1061 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
1062 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1064 commit 178b205e96217164fd7c30113464250d0b6f5eca
1065 Author: Johannes Berg <johannes.berg@intel.com>
1066 Date: Thu Jan 23 16:32:29 2014 +0100
1068 cfg80211: re-enable 5/10 MHz support
1070 Unfortunately I forgot this during the merge window, but the
1071 patch seems small enough to go in as a fix. The userspace API
1072 bug that was the reason for disabling it has long been fixed.
1074 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1076 commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
1077 Author: Pontus Fuchs <pontus.fuchs@gmail.com>
1078 Date: Thu Jan 16 15:00:40 2014 +0100
1080 nl80211: Reset split_start when netlink skb is exhausted
1082 When the netlink skb is exhausted split_start is left set. In the
1083 subsequent retry, with a larger buffer, the dump is continued from the
1084 failing point instead of from the beginning.
1086 This was causing my rt28xx based USB dongle to now show up when
1087 running "iw list" with an old iw version without split dump support.
1089 Cc: stable@vger.kernel.org
1090 Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
1091 Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
1092 [avoid the entire workaround when state->split is set]
1093 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1095 commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
1096 Author: Eliad Peller <eliad@wizery.com>
1097 Date: Sun Jan 12 11:06:37 2014 +0200
1099 mac80211: move roc cookie assignment earlier
1101 ieee80211_start_roc_work() might add a new roc
1102 to existing roc, and tell cfg80211 it has already
1105 However, this might happen before the roc cookie
1106 was set, resulting in REMAIN_ON_CHANNEL (started)
1107 event with null cookie. Consequently, it can make
1108 wpa_supplicant go out of sync.
1110 Fix it by setting the roc cookie earlier.
1112 Cc: stable@vger.kernel.org
1113 Signed-off-by: Eliad Peller <eliad@wizery.com>
1114 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1116 commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
1117 Author: Johannes Berg <johannes.berg@intel.com>
1118 Date: Fri Jan 24 14:06:29 2014 +0100
1120 nl80211: send event when AP operation is stopped
1122 There are a few cases, e.g. suspend, where an AP interface is
1123 stopped by the kernel rather than by userspace request, most
1124 commonly when suspending. To let userspace know about this,
1125 send the NL80211_CMD_STOP_AP command as an event every time
1126 an AP interface is stopped. This also happens when userspace
1127 did in fact request the AP stop, but that's not a problem.
1129 For full-MAC drivers this may need to be extended to also
1130 cover cases where the device stopped the AP operation for
1131 some reason, this a bit more complicated because then all
1132 cfg80211 state also needs to be reset; such API is not part
1135 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1137 commit d5d567eda7704f190379ca852a8f9a4112e3eee3
1138 Author: Johannes Berg <johannes.berg@intel.com>
1139 Date: Thu Jan 23 16:20:29 2014 +0100
1141 mac80211: add length check in ieee80211_is_robust_mgmt_frame()
1143 A few places weren't checking that the frame passed to the
1144 function actually has enough data even though the function
1145 clearly documents it must have a payload byte. Make this
1146 safer by changing the function to take an skb and checking
1147 the length inside. The old version is preserved for now as
1148 the rtl* drivers use it and don't have a correct skb.
1150 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1152 commit f8f6d212a047fc65c7d3442dfc038f65517236fc
1153 Author: Johannes Berg <johannes.berg@intel.com>
1154 Date: Fri Jan 24 10:53:53 2014 +0100
1156 nl80211: fix scheduled scan RSSI matchset attribute confusion
1158 The scheduled scan matchsets were intended to be a list of filters,
1159 with the found BSS having to pass at least one of them to be passed
1160 to the host. When the RSSI attribute was added, however, this was
1161 broken and currently wpa_supplicant adds that attribute in its own
1162 matchset; however, it doesn't intend that to mean that anything
1163 that passes the RSSI filter should be passed to the host, instead
1164 it wants it to mean that everything needs to also have higher RSSI.
1166 This is semantically problematic because we have a list of filters
1167 like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
1168 one should be OR'ed and which one AND'ed.
1170 To fix this, move the RSSI filter attribute into each matchset. As
1171 we need to stay backward compatible, treat a matchset with only the
1172 RSSI attribute as a "default RSSI filter" for all other matchsets,
1173 but only if there are other matchsets (an RSSI-only matchset by
1174 itself is still desirable.)
1176 To make driver implementation easier, keep a global min_rssi_thold
1177 for the entire request as well. The only affected driver is ath6kl.
1179 I found this when I looked into the code after Raja Mani submitted
1180 a patch fixing the n_match_sets calculation to disregard the RSSI,
1181 but that patch didn't address the semantic issue.
1183 Reported-by: Raja Mani <rmani@qti.qualcomm.com>
1184 Acked-by: Luciano Coelho <luciano.coelho@intel.com>
1185 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1187 commit de553e8545e65a6dc4e45f43df7e1443d4291922
1188 Author: Johannes Berg <johannes.berg@intel.com>
1189 Date: Fri Jan 24 10:17:47 2014 +0100
1191 nl80211: check nla_parse() return values
1193 If there's a policy, then nla_parse() return values must be
1194 checked, otherwise the policy is useless and there's nothing
1195 that ensures the attributes are actually what we expect them
1198 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1200 commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
1201 Author: Karl Beldan <karl.beldan@rivierawaves.com>
1202 Date: Thu Jan 23 20:06:34 2014 +0100
1204 mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
1206 ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
1207 the BA parameters. In the discussion [1] about this patch, Johannes
1208 recalled that it fixed some races with the DELBA and indeed this
1209 behavior was introduced in [2].
1210 While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
1211 their BA params TID AC violates the spec and is more a workaround for
1212 some drivers. Helmut expressed some concerns wrt such drivers, in
1213 particular DELBAs in rt2x00.
1215 ATM, DELBAs are sent after a driver has called (hence "purposely")
1216 ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
1217 details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
1218 given to the driver ampdu_action supposed to call this function, which
1219 could prove handy to people trying to do the right thing in faulty
1220 drivers (if their fw/hw don't get in their way).
1222 [1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
1223 [2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
1225 Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
1226 Cc: Helmut Schaa <helmut.schaa@googlemail.com>
1227 Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
1228 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1229 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
1230 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
1231 @@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
1232 if (nw_type & ADHOC_NETWORK) {
1233 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
1234 nw_type & ADHOC_CREATOR ? "creator" : "joiner");
1235 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1236 + cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
1237 cfg80211_put_bss(ar->wiphy, bss);
1240 @@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
1243 if (vif->nw_type & ADHOC_NETWORK) {
1244 - if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
1245 + if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
1246 ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
1247 "%s: ath6k not in ibss mode\n", __func__);
1250 - memset(bssid, 0, ETH_ALEN);
1251 - cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
1255 @@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
1256 struct ath6kl_vif *vif = netdev_priv(dev);
1258 int ret, rssi_thold;
1259 + int n_match_sets = request->n_match_sets;
1262 + * If there's a matchset w/o an SSID, then assume it's just for
1263 + * the RSSI (nothing else is currently supported) and ignore it.
1264 + * The device only supports a global RSSI filter that we set below.
1266 + if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
1269 if (ar->state != ATH6KL_STATE_ON)
1271 @@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
1272 ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
1274 request->match_sets,
1275 - request->n_match_sets);
1280 - if (!request->n_match_sets) {
1281 + if (!n_match_sets) {
1282 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
1285 @@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
1287 if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
1288 ar->fw_capabilities)) {
1289 - if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1290 + if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
1292 - else if (request->rssi_thold < -127)
1293 + else if (request->min_rssi_thold < -127)
1296 - rssi_thold = request->rssi_thold;
1297 + rssi_thold = request->min_rssi_thold;
1299 ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
1301 --- a/drivers/net/wireless/ath/ath9k/hw.c
1302 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1303 @@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
1304 if (AR_SREV_9300_20_OR_LATER(ah))
1306 else if (AR_SREV_9100(ah))
1312 @@ -1534,7 +1534,7 @@ EXPORT_SYMBOL(ath9k_hw_check_nav);
1313 bool ath9k_hw_check_alive(struct ath_hw *ah)
1317 + u32 reg, last_val;
1319 if (AR_SREV_9300(ah))
1320 return !ath9k_hw_detect_mac_hang(ah);
1321 @@ -1542,9 +1542,14 @@ bool ath9k_hw_check_alive(struct ath_hw
1322 if (AR_SREV_9285_12_OR_LATER(ah))
1325 + last_val = REG_READ(ah, AR_OBS_BUS_1);
1327 reg = REG_READ(ah, AR_OBS_BUS_1);
1328 + if (reg != last_val)
1333 if ((reg & 0x7E7FFFEF) == 0x00702400)
1336 @@ -2051,9 +2056,8 @@ static bool ath9k_hw_set_power_awake(str
1338 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
1339 AR_RTC_FORCE_WAKE_EN);
1341 if (AR_SREV_9100(ah))
1347 --- a/drivers/net/wireless/ath/ath9k/main.c
1348 +++ b/drivers/net/wireless/ath/ath9k/main.c
1349 @@ -451,7 +451,7 @@ void ath9k_tasklet(unsigned long data)
1350 * interrupts are enabled in the reset routine.
1352 atomic_inc(&ah->intr_ref_cnt);
1353 - ath_dbg(common, ANY, "FATAL: Skipping interrupts\n");
1354 + ath_dbg(common, RESET, "FATAL: Skipping interrupts\n");
1358 @@ -471,7 +471,7 @@ void ath9k_tasklet(unsigned long data)
1359 * interrupts are enabled in the reset routine.
1361 atomic_inc(&ah->intr_ref_cnt);
1362 - ath_dbg(common, ANY,
1363 + ath_dbg(common, RESET,
1364 "BB_WATCHDOG: Skipping interrupts\n");
1367 @@ -484,7 +484,7 @@ void ath9k_tasklet(unsigned long data)
1368 type = RESET_TYPE_TX_GTT;
1369 ath9k_queue_reset(sc, type);
1370 atomic_inc(&ah->intr_ref_cnt);
1371 - ath_dbg(common, ANY,
1372 + ath_dbg(common, RESET,
1373 "GTT: Skipping interrupts\n");
1376 @@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
1378 static bool ath9k_has_tx_pending(struct ath_softc *sc)
1383 for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
1384 if (!ATH_TXQ_SETUP(sc, i))
1385 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
1386 +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
1387 @@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
1388 * config match list.
1390 for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
1391 + /* skip empty SSID matchsets */
1392 + if (!req->match_sets[i].ssid.ssid_len)
1394 scan->direct_scan[i].id = WLAN_EID_SSID;
1395 scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
1396 memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
1397 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1398 +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
1399 @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
1400 /* During testing, hdr was NULL */
1403 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1404 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1405 (ieee80211_has_protected(hdr->frame_control)))
1406 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1408 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1409 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
1410 @@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
1411 /* In testing, hdr was NULL here */
1414 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1415 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1416 (ieee80211_has_protected(hdr->frame_control)))
1417 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1419 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1420 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
1421 @@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
1422 /* during testing, hdr was NULL here */
1425 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1426 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1427 (ieee80211_has_protected(hdr->frame_control)))
1428 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1430 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1431 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
1432 @@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
1433 /* during testing, hdr could be NULL here */
1436 - if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
1437 + if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
1438 (ieee80211_has_protected(hdr->frame_control)))
1439 rx_status->flag &= ~RX_FLAG_DECRYPTED;
1441 --- a/include/linux/ieee80211.h
1442 +++ b/include/linux/ieee80211.h
1443 @@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
1447 + * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
1448 + * @fc: frame control field in little-endian byteorder
1450 +static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
1452 + /* IEEE 802.11-2012, definition of "bufferable management frame";
1453 + * note that this ignores the IBSS special case. */
1454 + return ieee80211_is_mgmt(fc) &&
1455 + (ieee80211_is_action(fc) ||
1456 + ieee80211_is_disassoc(fc) ||
1457 + ieee80211_is_deauth(fc));
1461 * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
1462 * @seq_ctrl: frame sequence control bytes in little-endian byteorder
1464 @@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
1468 - * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1469 + * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
1470 * @hdr: the frame (buffer must include at least the first octet of payload)
1472 -static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1473 +static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
1475 if (ieee80211_is_disassoc(hdr->frame_control) ||
1476 ieee80211_is_deauth(hdr->frame_control))
1477 @@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
1481 + * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
1482 + * @skb: the skb containing the frame, length will be checked
1484 +static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
1486 + if (skb->len < 25)
1488 + return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
1492 * ieee80211_is_public_action - check if frame is a public action frame
1494 * @len: length of the frame
1495 --- a/include/net/cfg80211.h
1496 +++ b/include/net/cfg80211.h
1497 @@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
1498 * struct cfg80211_match_set - sets of attributes to match
1500 * @ssid: SSID to be matched
1501 + * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1503 struct cfg80211_match_set {
1504 struct cfg80211_ssid ssid;
1509 @@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
1510 * @dev: the interface
1511 * @scan_start: start time of the scheduled scan
1512 * @channels: channels to scan
1513 - * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
1514 + * @min_rssi_thold: for drivers only supporting a single threshold, this
1515 + * contains the minimum over all matchsets
1517 struct cfg80211_sched_scan_request {
1518 struct cfg80211_ssid *ssids;
1519 @@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
1521 struct cfg80211_match_set *match_sets;
1524 + s32 min_rssi_thold;
1527 struct wiphy *wiphy;
1528 @@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
1529 * @identifier: (private) Identifier used in nl80211 to identify this
1530 * wireless device if it has no netdev
1531 * @current_bss: (private) Used by the internal configuration code
1532 - * @channel: (private) Used by the internal configuration code to track
1533 - * the user-set AP, monitor and WDS channel
1534 + * @chandef: (private) Used by the internal configuration code to track
1535 + * the user-set channel definition.
1536 * @preset_chandef: (private) Used by the internal configuration code to
1537 * track the channel to be used for AP later
1538 * @bssid: (private) Used by the internal configuration code
1539 @@ -3195,9 +3198,7 @@ struct wireless_dev {
1541 struct cfg80211_internal_bss *current_bss; /* associated / joined */
1542 struct cfg80211_chan_def preset_chandef;
1544 - /* for AP and mesh channel tracking */
1545 - struct ieee80211_channel *channel;
1546 + struct cfg80211_chan_def chandef;
1549 bool ibss_dfs_possible;
1550 @@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
1552 * @dev: network device
1553 * @bssid: the BSSID of the IBSS joined
1554 + * @channel: the channel of the IBSS joined
1555 * @gfp: allocation flags
1557 * This function notifies cfg80211 that the device joined an IBSS or
1558 @@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
1559 * with the locally generated beacon -- this guarantees that there is
1560 * always a scan result for this IBSS. cfg80211 will handle the rest.
1562 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
1563 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
1564 + struct ieee80211_channel *channel, gfp_t gfp);
1567 * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
1568 --- a/include/uapi/linux/nl80211.h
1569 +++ b/include/uapi/linux/nl80211.h
1570 @@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
1571 * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
1572 * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
1573 * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
1574 - * only report BSS with matching SSID.
1575 + * only report BSS with matching SSID.
1576 * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
1577 - * BSS in scan results. Filtering is turned off if not specified.
1578 + * BSS in scan results. Filtering is turned off if not specified. Note that
1579 + * if this attribute is in a match set of its own, then it is treated as
1580 + * the default value for all matchsets with an SSID, rather than being a
1581 + * matchset of its own without an RSSI filter. This is due to problems with
1582 + * how this API was implemented in the past. Also, due to the same problem,
1583 + * the only way to create a matchset with only an RSSI filter (with this
1584 + * attribute) is if there's only a single matchset with the RSSI attribute.
1585 * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
1586 * attribute number currently defined
1587 * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
1588 --- a/net/mac80211/agg-tx.c
1589 +++ b/net/mac80211/agg-tx.c
1590 @@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
1591 mgmt->u.action.u.addba_req.start_seq_num =
1592 cpu_to_le16(start_seq_num << 4);
1594 - ieee80211_tx_skb_tid(sdata, skb, tid);
1595 + ieee80211_tx_skb(sdata, skb);
1598 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
1599 --- a/net/mac80211/cfg.c
1600 +++ b/net/mac80211/cfg.c
1601 @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
1602 /* TODO: make hostapd tell us what it wants */
1603 sdata->smps_mode = IEEE80211_SMPS_OFF;
1604 sdata->needed_rx_chains = sdata->local->rx_chains;
1605 - sdata->radar_required = params->radar_required;
1607 mutex_lock(&local->mtx);
1608 + sdata->radar_required = params->radar_required;
1609 err = ieee80211_vif_use_channel(sdata, ¶ms->chandef,
1610 IEEE80211_CHANCTX_SHARED);
1611 mutex_unlock(&local->mtx);
1612 @@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
1613 IEEE80211_P2P_OPPPS_ENABLE_BIT;
1615 err = ieee80211_assign_beacon(sdata, ¶ms->beacon);
1618 + ieee80211_vif_release_channel(sdata);
1623 err = drv_start_ap(sdata->local, sdata);
1624 @@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
1626 kfree_rcu(old, rcu_head);
1627 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
1628 + ieee80211_vif_release_channel(sdata);
1632 @@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
1635 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
1636 + sdata_assert_lock(sdata);
1638 /* don't allow changing the beacon while CSA is in place - offset
1639 * of channel switch counter may change
1640 @@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
1641 struct probe_resp *old_probe_resp;
1642 struct cfg80211_chan_def chandef;
1644 + sdata_assert_lock(sdata);
1646 old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
1649 @@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
1650 kfree(sdata->u.ap.next_beacon);
1651 sdata->u.ap.next_beacon = NULL;
1653 - cancel_work_sync(&sdata->u.ap.request_smps_work);
1655 /* turn off carrier for this interface and dependent VLANs */
1656 list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
1657 netif_carrier_off(vlan->dev);
1658 @@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
1659 kfree_rcu(old_beacon, rcu_head);
1661 kfree_rcu(old_probe_resp, rcu_head);
1662 + sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
1664 __sta_info_flush(sdata, true);
1665 ieee80211_free_keys(sdata, true);
1666 @@ -1988,6 +1993,9 @@ static int ieee80211_change_bss(struct w
1668 band = ieee80211_get_sdata_band(sdata);
1670 + if (WARN_ON(!wiphy->bands[band]))
1673 if (params->use_cts_prot >= 0) {
1674 sdata->vif.bss_conf.use_cts_prot = params->use_cts_prot;
1675 changed |= BSS_CHANGED_ERP_CTS_PROT;
1676 @@ -2638,6 +2646,24 @@ static int ieee80211_start_roc_work(stru
1677 INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
1678 INIT_LIST_HEAD(&roc->dependents);
1681 + * cookie is either the roc cookie (for normal roc)
1682 + * or the SKB (for mgmt TX)
1685 + /* local->mtx protects this */
1686 + local->roc_cookie_counter++;
1687 + roc->cookie = local->roc_cookie_counter;
1688 + /* wow, you wrapped 64 bits ... more likely a bug */
1689 + if (WARN_ON(roc->cookie == 0)) {
1691 + local->roc_cookie_counter++;
1693 + *cookie = roc->cookie;
1695 + *cookie = (unsigned long)txskb;
1698 /* if there's one pending or we're scanning, queue this one */
1699 if (!list_empty(&local->roc_list) ||
1700 local->scanning || local->radar_detect_enabled)
1701 @@ -2772,24 +2798,6 @@ static int ieee80211_start_roc_work(stru
1703 list_add_tail(&roc->list, &local->roc_list);
1706 - * cookie is either the roc cookie (for normal roc)
1707 - * or the SKB (for mgmt TX)
1710 - /* local->mtx protects this */
1711 - local->roc_cookie_counter++;
1712 - roc->cookie = local->roc_cookie_counter;
1713 - /* wow, you wrapped 64 bits ... more likely a bug */
1714 - if (WARN_ON(roc->cookie == 0)) {
1716 - local->roc_cookie_counter++;
1718 - *cookie = roc->cookie;
1720 - *cookie = (unsigned long)txskb;
1726 @@ -3004,8 +3012,10 @@ void ieee80211_csa_finalize_work(struct
1727 if (!ieee80211_sdata_running(sdata))
1730 - sdata->radar_required = sdata->csa_radar_required;
1731 + sdata_assert_lock(sdata);
1733 mutex_lock(&local->mtx);
1734 + sdata->radar_required = sdata->csa_radar_required;
1735 err = ieee80211_vif_change_channel(sdata, &changed);
1736 mutex_unlock(&local->mtx);
1737 if (WARN_ON(err < 0))
1738 @@ -3022,13 +3032,13 @@ void ieee80211_csa_finalize_work(struct
1739 switch (sdata->vif.type) {
1740 case NL80211_IFTYPE_AP:
1741 err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
1742 + kfree(sdata->u.ap.next_beacon);
1743 + sdata->u.ap.next_beacon = NULL;
1749 - kfree(sdata->u.ap.next_beacon);
1750 - sdata->u.ap.next_beacon = NULL;
1752 ieee80211_bss_info_change_notify(sdata, err);
1754 case NL80211_IFTYPE_ADHOC:
1755 @@ -3066,7 +3076,7 @@ int ieee80211_channel_switch(struct wiph
1756 struct ieee80211_if_mesh __maybe_unused *ifmsh;
1757 int err, num_chanctx;
1759 - lockdep_assert_held(&sdata->wdev.mtx);
1760 + sdata_assert_lock(sdata);
1762 if (!list_empty(&local->roc_list) || local->scanning)
1764 --- a/net/mac80211/ht.c
1765 +++ b/net/mac80211/ht.c
1766 @@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
1767 mgmt->u.action.u.delba.params = cpu_to_le16(params);
1768 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
1770 - ieee80211_tx_skb_tid(sdata, skb, tid);
1771 + ieee80211_tx_skb(sdata, skb);
1774 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
1775 @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
1776 u.ap.request_smps_work);
1779 - __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
1780 + if (sdata_dereference(sdata->u.ap.beacon, sdata))
1781 + __ieee80211_request_smps_ap(sdata,
1782 + sdata->u.ap.driver_smps_mode);
1783 sdata_unlock(sdata);
1786 --- a/net/mac80211/iface.c
1787 +++ b/net/mac80211/iface.c
1788 @@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
1790 ieee80211_roc_purge(local, sdata);
1792 - if (sdata->vif.type == NL80211_IFTYPE_STATION)
1793 + switch (sdata->vif.type) {
1794 + case NL80211_IFTYPE_STATION:
1795 ieee80211_mgd_stop(sdata);
1797 - if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
1799 + case NL80211_IFTYPE_ADHOC:
1800 ieee80211_ibss_stop(sdata);
1803 + case NL80211_IFTYPE_AP:
1804 + cancel_work_sync(&sdata->u.ap.request_smps_work);
1811 * Remove all stations associated with this interface.
1812 @@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
1813 cancel_work_sync(&local->dynamic_ps_enable_work);
1815 cancel_work_sync(&sdata->recalc_smps);
1816 + sdata_lock(sdata);
1817 sdata->vif.csa_active = false;
1818 + sdata_unlock(sdata);
1819 cancel_work_sync(&sdata->csa_finalize_work);
1821 cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
1822 --- a/net/mac80211/rx.c
1823 +++ b/net/mac80211/rx.c
1824 @@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
1826 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1828 - if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
1829 + if (is_multicast_ether_addr(hdr->addr1))
1832 - return ieee80211_is_robust_mgmt_frame(hdr);
1833 + return ieee80211_is_robust_mgmt_frame(skb);
1837 @@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
1839 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
1841 - if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
1842 + if (!is_multicast_ether_addr(hdr->addr1))
1845 - return ieee80211_is_robust_mgmt_frame(hdr);
1846 + return ieee80211_is_robust_mgmt_frame(skb);
1850 @@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
1851 if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
1854 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
1855 + if (!ieee80211_is_robust_mgmt_frame(skb))
1856 return -1; /* not a robust management frame */
1858 mmie = (struct ieee80211_mmie *)
1859 @@ -1128,6 +1128,13 @@ static void sta_ps_end(struct sta_info *
1860 sta->sta.addr, sta->sta.aid);
1862 if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1864 + * Clear the flag only if the other one is still set
1865 + * so that the TX path won't start TX'ing new frames
1866 + * directly ... In the case that the driver flag isn't
1867 + * set ieee80211_sta_ps_deliver_wakeup() will clear it.
1869 + clear_sta_flag(sta, WLAN_STA_PS_STA);
1870 ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
1871 sta->sta.addr, sta->sta.aid);
1873 @@ -1311,18 +1318,15 @@ ieee80211_rx_h_sta_process(struct ieee80
1874 !ieee80211_has_morefrags(hdr->frame_control) &&
1875 !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
1876 (rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1877 - rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
1878 + rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1879 + /* PM bit is only checked in frames where it isn't reserved,
1880 + * in AP mode it's reserved in non-bufferable management frames
1881 + * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1883 + (!ieee80211_is_mgmt(hdr->frame_control) ||
1884 + ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1885 if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
1887 - * Ignore doze->wake transitions that are
1888 - * indicated by non-data frames, the standard
1889 - * is unclear here, but for example going to
1890 - * PS mode and then scanning would cause a
1891 - * doze->wake transition for the probe request,
1892 - * and that is clearly undesirable.
1894 - if (ieee80211_is_data(hdr->frame_control) &&
1895 - !ieee80211_has_pm(hdr->frame_control))
1896 + if (!ieee80211_has_pm(hdr->frame_control))
1899 if (ieee80211_has_pm(hdr->frame_control))
1900 @@ -1845,8 +1849,7 @@ static int ieee80211_drop_unencrypted_mg
1901 * having configured keys.
1903 if (unlikely(ieee80211_is_action(fc) && !rx->key &&
1904 - ieee80211_is_robust_mgmt_frame(
1905 - (struct ieee80211_hdr *) rx->skb->data)))
1906 + ieee80211_is_robust_mgmt_frame(rx->skb)))
1910 --- a/net/mac80211/tx.c
1911 +++ b/net/mac80211/tx.c
1912 @@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc,
1913 if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
1916 - if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
1918 + if (!ieee80211_is_robust_mgmt_frame(skb))
1922 @@ -478,6 +477,20 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1923 sta->sta.addr, sta->sta.aid, ac);
1924 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
1925 purge_old_ps_buffers(tx->local);
1927 + /* sync with ieee80211_sta_ps_deliver_wakeup */
1928 + spin_lock(&sta->ps_lock);
1930 + * STA woke up the meantime and all the frames on ps_tx_buf have
1931 + * been queued to pending queue. No reordering can happen, go
1932 + * ahead and Tx the packet.
1934 + if (!test_sta_flag(sta, WLAN_STA_PS_STA) &&
1935 + !test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
1936 + spin_unlock(&sta->ps_lock);
1937 + return TX_CONTINUE;
1940 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
1941 struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
1943 @@ -492,6 +505,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1944 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
1945 info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
1946 skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb);
1947 + spin_unlock(&sta->ps_lock);
1949 if (!timer_pending(&local->sta_cleanup))
1950 mod_timer(&local->sta_cleanup,
1951 @@ -525,9 +539,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
1953 /* only deauth, disassoc and action are bufferable MMPDUs */
1954 if (ieee80211_is_mgmt(hdr->frame_control) &&
1955 - !ieee80211_is_deauth(hdr->frame_control) &&
1956 - !ieee80211_is_disassoc(hdr->frame_control) &&
1957 - !ieee80211_is_action(hdr->frame_control)) {
1958 + !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
1959 if (tx->flags & IEEE80211_TX_UNICAST)
1960 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1962 @@ -567,7 +579,7 @@ ieee80211_tx_h_select_key(struct ieee802
1964 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1965 is_multicast_ether_addr(hdr->addr1) &&
1966 - ieee80211_is_robust_mgmt_frame(hdr) &&
1967 + ieee80211_is_robust_mgmt_frame(tx->skb) &&
1968 (key = rcu_dereference(tx->sdata->default_mgmt_key)))
1970 else if (is_multicast_ether_addr(hdr->addr1) &&
1971 @@ -582,12 +594,12 @@ ieee80211_tx_h_select_key(struct ieee802
1973 else if (tx->skb->protocol == tx->sdata->control_port_protocol)
1975 - else if (ieee80211_is_robust_mgmt_frame(hdr) &&
1976 + else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
1977 !(ieee80211_is_action(hdr->frame_control) &&
1978 tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
1980 else if (ieee80211_is_mgmt(hdr->frame_control) &&
1981 - !ieee80211_is_robust_mgmt_frame(hdr))
1982 + !ieee80211_is_robust_mgmt_frame(tx->skb))
1985 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
1986 @@ -878,7 +890,7 @@ static int ieee80211_fragment(struct iee
1989 /* adjust first fragment's length */
1990 - skb->len = hdrlen + per_fragm;
1991 + skb_trim(skb, hdrlen + per_fragm);
1995 @@ -2900,7 +2912,7 @@ ieee80211_get_buffered_bc(struct ieee802
1996 cpu_to_le16(IEEE80211_FCTL_MOREDATA);
1999 - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
2000 + if (sdata->vif.type == NL80211_IFTYPE_AP)
2001 sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev);
2002 if (!ieee80211_tx_prepare(sdata, &tx, skb))
2004 --- a/net/mac80211/wpa.c
2005 +++ b/net/mac80211/wpa.c
2006 @@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
2007 hdrlen = ieee80211_hdrlen(hdr->frame_control);
2009 if (!ieee80211_is_data(hdr->frame_control) &&
2010 - !ieee80211_is_robust_mgmt_frame(hdr))
2011 + !ieee80211_is_robust_mgmt_frame(skb))
2014 data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
2015 --- a/net/wireless/ap.c
2016 +++ b/net/wireless/ap.c
2017 @@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
2018 err = rdev_stop_ap(rdev, dev);
2020 wdev->beacon_interval = 0;
2021 - wdev->channel = NULL;
2022 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2024 rdev_set_qos_map(rdev, dev, NULL);
2025 + nl80211_send_ap_stopped(wdev);
2029 --- a/net/wireless/core.c
2030 +++ b/net/wireless/core.c
2031 @@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
2035 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
2036 - !rdev->scan_req->notified);
2037 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
2038 + if (WARN_ON(!rdev->scan_req->notified))
2039 + rdev->scan_req->aborted = true;
2040 + ___cfg80211_scan_done(rdev, false);
2044 static int cfg80211_rfkill_set_block(void *data, bool blocked)
2045 @@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
2047 u16 ifmodes = wiphy->interface_modes;
2049 - /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
2050 - wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
2053 * There are major locking problems in nl80211/mac80211 for CSA,
2054 * disable for all drivers until this has been reworked.
2055 @@ -795,8 +795,6 @@ void cfg80211_leave(struct cfg80211_regi
2060 - wdev->beacon_interval = 0;
2063 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
2064 @@ -875,8 +873,11 @@ static int cfg80211_netdev_notifier_call
2067 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
2068 - WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
2069 - !rdev->scan_req->notified);
2070 + if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
2071 + if (WARN_ON(!rdev->scan_req->notified))
2072 + rdev->scan_req->aborted = true;
2073 + ___cfg80211_scan_done(rdev, false);
2076 if (WARN_ON(rdev->sched_scan_req &&
2077 rdev->sched_scan_req->dev == wdev->netdev)) {
2078 --- a/net/wireless/core.h
2079 +++ b/net/wireless/core.h
2080 @@ -62,6 +62,7 @@ struct cfg80211_registered_device {
2081 struct rb_root bss_tree;
2083 struct cfg80211_scan_request *scan_req; /* protected by RTNL */
2084 + struct sk_buff *scan_msg;
2085 struct cfg80211_sched_scan_request *sched_scan_req;
2086 unsigned long suspend_at;
2087 struct work_struct scan_done_wk;
2088 @@ -210,6 +211,7 @@ struct cfg80211_event {
2092 + struct ieee80211_channel *channel;
2096 @@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
2097 struct net_device *dev, bool nowext);
2098 int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
2099 struct net_device *dev, bool nowext);
2100 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
2101 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2102 + struct ieee80211_channel *channel);
2103 int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
2104 struct wireless_dev *wdev);
2106 @@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
2107 struct key_params *params, int key_idx,
2108 bool pairwise, const u8 *mac_addr);
2109 void __cfg80211_scan_done(struct work_struct *wk);
2110 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
2111 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2112 + bool send_message);
2113 void __cfg80211_sched_scan_results(struct work_struct *wk);
2114 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
2115 bool driver_initiated);
2116 @@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
2118 cfg80211_get_chan_state(struct wireless_dev *wdev,
2119 struct ieee80211_channel **chan,
2120 - enum cfg80211_chan_mode *chanmode);
2121 + enum cfg80211_chan_mode *chanmode,
2122 + u8 *radar_detect);
2124 int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
2125 struct cfg80211_chan_def *chandef);
2126 --- a/net/wireless/nl80211.c
2127 +++ b/net/wireless/nl80211.c
2128 @@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
2129 * We can then retry with the larger buffer.
2131 if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
2133 + !skb->len && !state->split &&
2134 cb->min_dump_alloc < 4096) {
2135 cb->min_dump_alloc = 4096;
2136 + state->split_start = 0;
2140 @@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
2141 nla_for_each_nested(nl_txq_params,
2142 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
2144 - nla_parse(tb, NL80211_TXQ_ATTR_MAX,
2145 - nla_data(nl_txq_params),
2146 - nla_len(nl_txq_params),
2147 - txq_params_policy);
2148 + result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
2149 + nla_data(nl_txq_params),
2150 + nla_len(nl_txq_params),
2151 + txq_params_policy);
2154 result = parse_txq_params(tb, &txq_params);
2157 @@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
2159 wdev->preset_chandef = params.chandef;
2160 wdev->beacon_interval = params.beacon_interval;
2161 - wdev->channel = params.chandef.chan;
2162 + wdev->chandef = params.chandef;
2163 wdev->ssid_len = params.ssid_len;
2164 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
2166 @@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
2168 nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
2170 - nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
2171 - nla_data(nl_reg_rule), nla_len(nl_reg_rule),
2173 + r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
2174 + nla_data(nl_reg_rule), nla_len(nl_reg_rule),
2178 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
2181 @@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
2182 if (!rdev->ops->scan)
2185 - if (rdev->scan_req) {
2186 + if (rdev->scan_req || rdev->scan_msg) {
2190 @@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
2191 enum ieee80211_band band;
2193 struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
2194 + s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
2196 if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
2197 !rdev->ops->sched_scan_start)
2198 @@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
2199 if (n_ssids > wiphy->max_sched_scan_ssids)
2202 - if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
2204 + * First, count the number of 'real' matchsets. Due to an issue with
2205 + * the old implementation, matchsets containing only the RSSI attribute
2206 + * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
2207 + * RSSI for all matchsets, rather than their own matchset for reporting
2208 + * all APs with a strong RSSI. This is needed to be compatible with
2209 + * older userspace that treated a matchset with only the RSSI as the
2210 + * global RSSI for all other matchsets - if there are other matchsets.
2212 + if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
2213 nla_for_each_nested(attr,
2214 info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
2218 + struct nlattr *rssi;
2220 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2221 + nla_data(attr), nla_len(attr),
2222 + nl80211_match_policy);
2225 + /* add other standalone attributes here */
2226 + if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
2230 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2232 + default_match_rssi = nla_get_s32(rssi);
2236 + /* However, if there's no other matchset, add the RSSI one */
2237 + if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
2240 if (n_match_sets > wiphy->max_match_sets)
2242 @@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
2244 struct nlattr *ssid, *rssi;
2246 - nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2247 - nla_data(attr), nla_len(attr),
2248 - nl80211_match_policy);
2249 + err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
2250 + nla_data(attr), nla_len(attr),
2251 + nl80211_match_policy);
2254 ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
2256 + if (WARN_ON(i >= n_match_sets)) {
2257 + /* this indicates a programming error,
2258 + * the loop above should have verified
2265 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
2268 @@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
2269 nla_data(ssid), nla_len(ssid));
2270 request->match_sets[i].ssid.ssid_len =
2272 + /* special attribute - old implemenation w/a */
2273 + request->match_sets[i].rssi_thold =
2274 + default_match_rssi;
2275 + rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2277 + request->match_sets[i].rssi_thold =
2278 + nla_get_s32(rssi);
2280 - rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
2282 - request->rssi_thold = nla_get_u32(rssi);
2284 - request->rssi_thold =
2285 - NL80211_SCAN_RSSI_THOLD_OFF;
2289 + /* there was no other matchset, so the RSSI one is alone */
2291 + request->match_sets[0].rssi_thold = default_match_rssi;
2293 + request->min_rssi_thold = INT_MAX;
2294 + for (i = 0; i < n_match_sets; i++)
2295 + request->min_rssi_thold =
2296 + min(request->match_sets[i].rssi_thold,
2297 + request->min_rssi_thold);
2299 + request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
2302 if (info->attrs[NL80211_ATTR_IE]) {
2303 @@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
2305 err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
2307 - wdev->channel = chandef.chan;
2308 + wdev->chandef = chandef;
2309 wdev->cac_started = true;
2310 wdev->cac_start_time = jiffies;
2312 @@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
2313 * directly to the enum ieee80211_band values used in cfg80211.
2315 BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
2316 - nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
2318 + nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
2319 enum ieee80211_band band = nla_type(tx_rates);
2322 if (band < 0 || band >= IEEE80211_NUM_BANDS)
2324 sband = rdev->wiphy.bands[band];
2327 - nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2328 - nla_len(tx_rates), nl80211_txattr_policy);
2329 + err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
2330 + nla_len(tx_rates), nl80211_txattr_policy);
2333 if (tb[NL80211_TXRATE_LEGACY]) {
2334 mask.control[band].legacy = rateset_to_mask(
2336 @@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
2337 NL80211_MCGRP_SCAN, GFP_KERNEL);
2340 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2341 - struct wireless_dev *wdev)
2342 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2343 + struct wireless_dev *wdev, bool aborted)
2345 struct sk_buff *msg;
2347 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2352 if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2353 - NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2354 + aborted ? NL80211_CMD_SCAN_ABORTED :
2355 + NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
2361 - genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2362 - NL80211_MCGRP_SCAN, GFP_KERNEL);
2366 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2367 - struct wireless_dev *wdev)
2368 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2369 + struct sk_buff *msg)
2371 - struct sk_buff *msg;
2373 - msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2377 - if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
2378 - NL80211_CMD_SCAN_ABORTED) < 0) {
2383 genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
2384 NL80211_MCGRP_SCAN, GFP_KERNEL);
2386 @@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
2387 wdev->iftype != NL80211_IFTYPE_MESH_POINT))
2390 - wdev->channel = chandef->chan;
2391 + wdev->chandef = *chandef;
2392 + wdev->preset_chandef = *chandef;
2393 nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
2395 EXPORT_SYMBOL(cfg80211_ch_switch_notify);
2396 @@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct
2398 EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
2400 +void nl80211_send_ap_stopped(struct wireless_dev *wdev)
2402 + struct wiphy *wiphy = wdev->wiphy;
2403 + struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
2404 + struct sk_buff *msg;
2407 + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
2411 + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
2415 + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
2416 + nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
2417 + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
2420 + genlmsg_end(msg, hdr);
2422 + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
2423 + NL80211_MCGRP_MLME, GFP_KERNEL);
2429 /* initialisation/exit functions */
2431 int nl80211_init(void)
2432 --- a/net/wireless/nl80211.h
2433 +++ b/net/wireless/nl80211.h
2434 @@ -8,10 +8,10 @@ void nl80211_exit(void);
2435 void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
2436 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
2437 struct wireless_dev *wdev);
2438 -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
2439 - struct wireless_dev *wdev);
2440 -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
2441 - struct wireless_dev *wdev);
2442 +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
2443 + struct wireless_dev *wdev, bool aborted);
2444 +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
2445 + struct sk_buff *msg);
2446 void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
2447 struct net_device *netdev, u32 cmd);
2448 void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
2449 @@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
2450 enum nl80211_radar_event event,
2451 struct net_device *netdev, gfp_t gfp);
2453 +void nl80211_send_ap_stopped(struct wireless_dev *wdev);
2455 void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
2457 #endif /* __NET_WIRELESS_NL80211_H */
2458 --- a/net/wireless/scan.c
2459 +++ b/net/wireless/scan.c
2460 @@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
2461 dev->bss_generation++;
2464 -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
2465 +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
2466 + bool send_message)
2468 struct cfg80211_scan_request *request;
2469 struct wireless_dev *wdev;
2470 + struct sk_buff *msg;
2471 #ifdef CPTCFG_CFG80211_WEXT
2472 union iwreq_data wrqu;
2477 - request = rdev->scan_req;
2478 + if (rdev->scan_msg) {
2479 + nl80211_send_scan_result(rdev, rdev->scan_msg);
2480 + rdev->scan_msg = NULL;
2484 + request = rdev->scan_req;
2488 @@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
2490 cfg80211_sme_scan_done(wdev->netdev);
2492 - if (request->aborted) {
2493 - nl80211_send_scan_aborted(rdev, wdev);
2495 - if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
2496 - /* flush entries from previous scans */
2497 - spin_lock_bh(&rdev->bss_lock);
2498 - __cfg80211_bss_expire(rdev, request->scan_start);
2499 - spin_unlock_bh(&rdev->bss_lock);
2501 - nl80211_send_scan_done(rdev, wdev);
2502 + if (!request->aborted &&
2503 + request->flags & NL80211_SCAN_FLAG_FLUSH) {
2504 + /* flush entries from previous scans */
2505 + spin_lock_bh(&rdev->bss_lock);
2506 + __cfg80211_bss_expire(rdev, request->scan_start);
2507 + spin_unlock_bh(&rdev->bss_lock);
2510 + msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
2512 #ifdef CPTCFG_CFG80211_WEXT
2513 if (wdev->netdev && !request->aborted) {
2514 memset(&wrqu, 0, sizeof(wrqu));
2515 @@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
2517 rdev->scan_req = NULL;
2520 + if (!send_message)
2521 + rdev->scan_msg = msg;
2523 + nl80211_send_scan_result(rdev, msg);
2526 void __cfg80211_scan_done(struct work_struct *wk)
2527 @@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
2531 - ___cfg80211_scan_done(rdev);
2532 + ___cfg80211_scan_done(rdev, true);
2536 @@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
2538 return PTR_ERR(rdev);
2540 - if (rdev->scan_req) {
2541 + if (rdev->scan_req || rdev->scan_msg) {
2545 @@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
2547 return PTR_ERR(rdev);
2549 - if (rdev->scan_req)
2550 + if (rdev->scan_req || rdev->scan_msg)
2553 res = ieee80211_scan_results(rdev, info, extra, data->length);
2554 --- a/net/wireless/sme.c
2555 +++ b/net/wireless/sme.c
2556 @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
2557 ASSERT_RDEV_LOCK(rdev);
2558 ASSERT_WDEV_LOCK(wdev);
2560 - if (rdev->scan_req)
2561 + if (rdev->scan_req || rdev->scan_msg)
2564 if (wdev->conn->params.channel)
2565 --- a/net/mac80211/mlme.c
2566 +++ b/net/mac80211/mlme.c
2567 @@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct
2570 ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
2571 - sdata->vif.csa_active = true;
2573 mutex_lock(&local->chanctx_mtx);
2574 if (local->use_chanctx) {
2575 @@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct
2576 mutex_unlock(&local->chanctx_mtx);
2578 sdata->csa_chandef = csa_ie.chandef;
2579 + sdata->vif.csa_active = true;
2582 ieee80211_stop_queues_by_reason(&local->hw,
2583 --- a/net/mac80211/chan.c
2584 +++ b/net/mac80211/chan.c
2585 @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
2587 struct ieee80211_sub_if_data *sdata;
2589 + lockdep_assert_held(&local->mtx);
2592 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2593 if (sdata->radar_required) {
2594 --- a/net/mac80211/ibss.c
2595 +++ b/net/mac80211/ibss.c
2596 @@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
2599 mutex_lock(&local->mtx);
2600 - ieee80211_vif_release_channel(sdata);
2601 if (ieee80211_vif_use_channel(sdata, &chandef,
2602 ifibss->fixed_channel ?
2603 IEEE80211_CHANCTX_SHARED :
2604 @@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
2605 mutex_unlock(&local->mtx);
2608 + sdata->radar_required = radar_required;
2609 mutex_unlock(&local->mtx);
2611 memcpy(ifibss->bssid, bssid, ETH_ALEN);
2612 @@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
2613 rcu_assign_pointer(ifibss->presp, presp);
2614 mgmt = (void *)presp->head;
2616 - sdata->radar_required = radar_required;
2617 sdata->vif.bss_conf.enable_beacon = true;
2618 sdata->vif.bss_conf.beacon_int = beacon_int;
2619 sdata->vif.bss_conf.basic_rates = basic_rates;
2620 @@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
2621 presp->head_len, 0, GFP_KERNEL);
2622 cfg80211_put_bss(local->hw.wiphy, bss);
2623 netif_carrier_on(sdata->dev);
2624 - cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
2625 + cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
2628 static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
2629 @@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
2633 + sdata_assert_lock(sdata);
2635 sta_flags = IEEE80211_STA_DISABLE_VHT;
2636 switch (ifibss->chandef.width) {
2637 case NL80211_CHAN_WIDTH_5:
2638 @@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
2639 memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
2640 ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
2641 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
2643 + /* avoid excessive retries for probe request to wildcard SSIDs */
2645 + IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
2647 ieee80211_tx_skb(sdata, skb);
2650 --- a/net/mac80211/mesh.c
2651 +++ b/net/mac80211/mesh.c
2652 @@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct
2653 if (!ifmsh->mesh_id)
2656 + sdata_assert_lock(sdata);
2658 sta_flags = IEEE80211_STA_DISABLE_VHT;
2659 switch (sdata->vif.bss_conf.chandef.width) {
2660 case NL80211_CHAN_WIDTH_20_NOHT:
2661 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2662 +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
2663 @@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
2664 struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
2665 struct net_device *ndev = ifp->ndev;
2666 struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
2667 + struct ieee80211_channel *chan;
2670 if (ifp->vif->mode == WL_MODE_AP) {
2671 @@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
2672 } else if (brcmf_is_linkup(e)) {
2673 brcmf_dbg(CONN, "Linkup\n");
2674 if (brcmf_is_ibssmode(ifp->vif)) {
2675 + chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
2676 memcpy(profile->bssid, e->addr, ETH_ALEN);
2677 wl_inform_ibss(cfg, ndev, e->addr);
2678 - cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
2679 + cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
2680 clear_bit(BRCMF_VIF_STATUS_CONNECTING,
2681 &ifp->vif->sme_state);
2682 set_bit(BRCMF_VIF_STATUS_CONNECTED,
2683 --- a/drivers/net/wireless/libertas/cfg.c
2684 +++ b/drivers/net/wireless/libertas/cfg.c
2685 @@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
2686 memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
2687 priv->wdev->ssid_len = params->ssid_len;
2689 - cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
2690 + cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
2693 /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
2694 priv->connect_status = LBS_CONNECTED;
2695 --- a/drivers/net/wireless/mwifiex/cfg80211.c
2696 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
2697 @@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy
2701 - cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
2702 + cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
2703 + params->chandef.chan, GFP_KERNEL);
2704 dev_dbg(priv->adapter->dev,
2705 "info: joined/created adhoc network with bssid"
2706 " %pM successfully\n", priv->cfg_bssid);
2707 --- a/drivers/net/wireless/rndis_wlan.c
2708 +++ b/drivers/net/wireless/rndis_wlan.c
2709 @@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
2710 bssid, req_ie, req_ie_len,
2711 resp_ie, resp_ie_len, GFP_KERNEL);
2712 } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
2713 - cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
2714 + cfg80211_ibss_joined(usbdev->net, bssid,
2715 + get_current_channel(usbdev, NULL),
2720 --- a/net/wireless/ibss.c
2721 +++ b/net/wireless/ibss.c
2723 #include "rdev-ops.h"
2726 -void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
2727 +void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2728 + struct ieee80211_channel *channel)
2730 struct wireless_dev *wdev = dev->ieee80211_ptr;
2731 struct cfg80211_bss *bss;
2732 @@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
2733 if (!wdev->ssid_len)
2736 - bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
2737 - wdev->ssid, wdev->ssid_len,
2738 + bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
2739 WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
2742 @@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
2746 -void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
2747 +void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
2748 + struct ieee80211_channel *channel, gfp_t gfp)
2750 struct wireless_dev *wdev = dev->ieee80211_ptr;
2751 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
2752 struct cfg80211_event *ev;
2753 unsigned long flags;
2755 - trace_cfg80211_ibss_joined(dev, bssid);
2756 + trace_cfg80211_ibss_joined(dev, bssid, channel);
2758 + if (WARN_ON(!channel))
2761 ev = kzalloc(sizeof(*ev), gfp);
2765 ev->type = EVENT_IBSS_JOINED;
2766 - memcpy(ev->cr.bssid, bssid, ETH_ALEN);
2767 + memcpy(ev->ij.bssid, bssid, ETH_ALEN);
2768 + ev->ij.channel = channel;
2770 spin_lock_irqsave(&wdev->event_lock, flags);
2771 list_add_tail(&ev->list, &wdev->event_list);
2772 @@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
2774 wdev->ibss_fixed = params->channel_fixed;
2775 wdev->ibss_dfs_possible = params->userspace_handles_dfs;
2776 + wdev->chandef = params->chandef;
2777 #ifdef CPTCFG_CFG80211_WEXT
2778 wdev->wext.ibss.chandef = params->chandef;
2780 @@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
2782 wdev->current_bss = NULL;
2784 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2785 #ifdef CPTCFG_CFG80211_WEXT
2787 wdev->wext.ibss.ssid_len = 0;
2788 --- a/net/wireless/trace.h
2789 +++ b/net/wireless/trace.h
2790 @@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
2791 TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
2794 -DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
2795 - TP_PROTO(struct net_device *netdev, const u8 *addr),
2796 - TP_ARGS(netdev, addr)
2799 DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
2800 TP_PROTO(struct net_device *netdev, const u8 *addr),
2801 TP_ARGS(netdev, addr)
2802 @@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
2803 TP_ARGS(netdev, addr)
2806 +TRACE_EVENT(cfg80211_ibss_joined,
2807 + TP_PROTO(struct net_device *netdev, const u8 *bssid,
2808 + struct ieee80211_channel *channel),
2809 + TP_ARGS(netdev, bssid, channel),
2817 + MAC_ASSIGN(bssid, bssid);
2818 + CHAN_ASSIGN(channel);
2820 + TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
2821 + NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
2824 TRACE_EVENT(cfg80211_probe_status,
2825 TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
2827 --- a/net/wireless/util.c
2828 +++ b/net/wireless/util.c
2829 @@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
2830 ev->dc.reason, true);
2832 case EVENT_IBSS_JOINED:
2833 - __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
2834 + __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
2839 @@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct
2841 mutex_lock_nested(&wdev_iter->mtx, 1);
2842 __acquire(wdev_iter->mtx);
2843 - cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
2844 + cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
2845 wdev_unlock(wdev_iter);
2848 --- a/net/wireless/chan.c
2849 +++ b/net/wireless/chan.c
2850 @@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct
2852 cfg80211_get_chan_state(struct wireless_dev *wdev,
2853 struct ieee80211_channel **chan,
2854 - enum cfg80211_chan_mode *chanmode)
2855 + enum cfg80211_chan_mode *chanmode,
2859 *chanmode = CHAN_MODE_UNDEFINED;
2860 @@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
2861 !wdev->ibss_dfs_possible)
2863 : CHAN_MODE_EXCLUSIVE;
2865 + /* consider worst-case - IBSS can try to return to the
2866 + * original user-specified channel as creator */
2867 + if (wdev->ibss_dfs_possible)
2868 + *radar_detect |= BIT(wdev->chandef.width);
2872 @@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
2873 case NL80211_IFTYPE_AP:
2874 case NL80211_IFTYPE_P2P_GO:
2875 if (wdev->cac_started) {
2876 - *chan = wdev->channel;
2877 + *chan = wdev->chandef.chan;
2878 *chanmode = CHAN_MODE_SHARED;
2879 + *radar_detect |= BIT(wdev->chandef.width);
2880 } else if (wdev->beacon_interval) {
2881 - *chan = wdev->channel;
2882 + *chan = wdev->chandef.chan;
2883 *chanmode = CHAN_MODE_SHARED;
2885 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2887 + *radar_detect |= BIT(wdev->chandef.width);
2890 case NL80211_IFTYPE_MESH_POINT:
2891 if (wdev->mesh_id_len) {
2892 - *chan = wdev->channel;
2893 + *chan = wdev->chandef.chan;
2894 *chanmode = CHAN_MODE_SHARED;
2896 + if (cfg80211_chandef_dfs_required(wdev->wiphy,
2898 + *radar_detect |= BIT(wdev->chandef.width);
2901 case NL80211_IFTYPE_MONITOR:
2902 --- a/net/wireless/mesh.c
2903 +++ b/net/wireless/mesh.c
2904 @@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
2906 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
2907 wdev->mesh_id_len = setup->mesh_id_len;
2908 - wdev->channel = setup->chandef.chan;
2909 + wdev->chandef = setup->chandef;
2913 @@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
2914 err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
2917 - wdev->channel = chandef->chan;
2918 + wdev->chandef = *chandef;
2922 @@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct
2923 err = rdev_leave_mesh(rdev, dev);
2925 wdev->mesh_id_len = 0;
2926 - wdev->channel = NULL;
2927 + memset(&wdev->chandef, 0, sizeof(wdev->chandef));
2928 rdev_set_qos_map(rdev, dev, NULL);
2931 --- a/net/wireless/mlme.c
2932 +++ b/net/wireless/mlme.c
2933 @@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
2934 if (WARN_ON(!wdev->cac_started))
2937 - if (WARN_ON(!wdev->channel))
2938 + if (WARN_ON(!wdev->chandef.chan))
2942 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2943 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2944 @@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
2949 + if (is2GHz && !twiceMaxEdgePower)
2950 + twiceMaxEdgePower = 60;
2952 return twiceMaxEdgePower;
2955 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2956 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
2958 #define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
2959 #define MAX_MAG_DELTA 11
2960 #define MAX_PHS_DELTA 10
2964 - int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2965 - int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
2966 + int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2967 + int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
2971 @@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2975 - iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
2976 + iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
2978 ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
2979 chain_idx, iqc_coeff[0]);
2980 @@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
2984 - iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
2985 + iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
2987 ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
2988 chain_idx, iqc_coeff[1]);
2989 @@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
2993 -static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
2994 +static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
2998 int mp_max = -64, max_idx = 0;
2999 @@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
3001 /* find min/max mismatch across all calibrated gains */
3002 for (i = 0; i < nmeasurement; i++) {
3003 - if (mp_coeff[i] > mp_max) {
3004 - mp_max = mp_coeff[i];
3005 + if (mp_coeff[i][0] > mp_max) {
3006 + mp_max = mp_coeff[i][0];
3008 - } else if (mp_coeff[i] < mp_min) {
3009 - mp_min = mp_coeff[i];
3010 + } else if (mp_coeff[i][0] < mp_min) {
3011 + mp_min = mp_coeff[i][0];
3016 /* find average (exclude max abs value) */
3017 for (i = 0; i < nmeasurement; i++) {
3018 - if ((abs(mp_coeff[i]) < abs(mp_max)) ||
3019 - (abs(mp_coeff[i]) < abs(mp_min))) {
3020 - mp_avg += mp_coeff[i];
3021 + if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
3022 + (abs(mp_coeff[i][0]) < abs(mp_min))) {
3023 + mp_avg += mp_coeff[i][0];
3027 @@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
3031 - mp_avg = mp_coeff[nmeasurement - 1];
3032 + mp_avg = mp_coeff[nmeasurement - 1][0];
3034 /* detect outlier */
3035 if (abs(mp_max - mp_min) > max_delta) {
3036 @@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
3038 outlier_idx = min_idx;
3040 - mp_coeff[outlier_idx] = mp_avg;
3041 + mp_coeff[outlier_idx][0] = mp_avg;
3045 -static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
3046 - struct coeff *coeff,
3048 +static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
3049 + struct coeff *coeff,
3052 int i, im, nmeasurement;
3053 + int magnitude, phase;
3054 u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
3055 struct ath9k_hw_cal_data *caldata = ah->caldata;
3057 @@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
3058 if (nmeasurement > MAX_MEASUREMENT)
3059 nmeasurement = MAX_MEASUREMENT;
3061 - /* detect outlier only if nmeasurement > 1 */
3062 - if (nmeasurement > 1) {
3063 - /* Detect magnitude outlier */
3064 - ar9003_hw_detect_outlier(coeff->mag_coeff[i],
3065 - nmeasurement, MAX_MAG_DELTA);
3067 - /* Detect phase outlier */
3068 - ar9003_hw_detect_outlier(coeff->phs_coeff[i],
3069 - nmeasurement, MAX_PHS_DELTA);
3071 + * Skip normal outlier detection for AR9550.
3073 + if (!AR_SREV_9550(ah)) {
3074 + /* detect outlier only if nmeasurement > 1 */
3075 + if (nmeasurement > 1) {
3076 + /* Detect magnitude outlier */
3077 + ar9003_hw_detect_outlier(coeff->mag_coeff[i],
3081 + /* Detect phase outlier */
3082 + ar9003_hw_detect_outlier(coeff->phs_coeff[i],
3088 for (im = 0; im < nmeasurement; im++) {
3089 + magnitude = coeff->mag_coeff[i][im][0];
3090 + phase = coeff->phs_coeff[i][im][0];
3092 - coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
3093 - ((coeff->phs_coeff[i][im] & 0x7f) << 7);
3094 + coeff->iqc_coeff[0] =
3095 + (phase & 0x7f) | ((magnitude & 0x7f) << 7);
3098 REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
3099 @@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
3103 -static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
3104 +static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
3105 + struct coeff *coeff,
3106 + int i, int nmeasurement)
3108 + struct ath_common *common = ath9k_hw_common(ah);
3109 + int im, ix, iy, temp;
3111 + for (im = 0; im < nmeasurement; im++) {
3112 + for (ix = 0; ix < MAXIQCAL - 1; ix++) {
3113 + for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
3114 + if (coeff->mag_coeff[i][im][iy] <
3115 + coeff->mag_coeff[i][im][ix]) {
3116 + temp = coeff->mag_coeff[i][im][ix];
3117 + coeff->mag_coeff[i][im][ix] =
3118 + coeff->mag_coeff[i][im][iy];
3119 + coeff->mag_coeff[i][im][iy] = temp;
3121 + if (coeff->phs_coeff[i][im][iy] <
3122 + coeff->phs_coeff[i][im][ix]) {
3123 + temp = coeff->phs_coeff[i][im][ix];
3124 + coeff->phs_coeff[i][im][ix] =
3125 + coeff->phs_coeff[i][im][iy];
3126 + coeff->phs_coeff[i][im][iy] = temp;
3130 + coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
3131 + coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
3133 + ath_dbg(common, CALIBRATE,
3134 + "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
3136 + coeff->mag_coeff[i][im][0],
3137 + coeff->phs_coeff[i][im][0]);
3141 +static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
3142 + struct coeff *coeff,
3148 + if ((iqcal_idx + 1) != MAXIQCAL)
3151 + for (i = 0; i < AR9300_MAX_CHAINS; i++) {
3152 + __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
3158 +static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
3162 struct ath_common *common = ath9k_hw_common(ah);
3163 const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
3164 @@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
3165 AR_PHY_CHAN_INFO_TAB_1,
3166 AR_PHY_CHAN_INFO_TAB_2,
3168 - struct coeff coeff;
3169 + static struct coeff coeff;
3173 + int nmeasurement = 0;
3174 + bool outlier_detect = true;
3176 for (i = 0; i < AR9300_MAX_CHAINS; i++) {
3177 if (!(ah->txchainmask & (1 << i)))
3178 @@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
3182 - coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
3183 - coeff.phs_coeff[i][im] =
3184 + coeff.phs_coeff[i][im][iqcal_idx] =
3185 + coeff.iqc_coeff[0] & 0x7f;
3186 + coeff.mag_coeff[i][im][iqcal_idx] =
3187 (coeff.iqc_coeff[0] >> 7) & 0x7f;
3189 - if (coeff.mag_coeff[i][im] > 63)
3190 - coeff.mag_coeff[i][im] -= 128;
3191 - if (coeff.phs_coeff[i][im] > 63)
3192 - coeff.phs_coeff[i][im] -= 128;
3193 + if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
3194 + coeff.mag_coeff[i][im][iqcal_idx] -= 128;
3195 + if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
3196 + coeff.phs_coeff[i][im][iqcal_idx] -= 128;
3199 - ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
3201 + if (AR_SREV_9550(ah))
3202 + outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
3203 + iqcal_idx, nmeasurement);
3204 + if (outlier_detect)
3205 + ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
3209 @@ -1409,7 +1484,7 @@ skip_tx_iqcal:
3213 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
3214 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
3215 else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
3216 ar9003_hw_tx_iq_cal_reload(ah);
3218 @@ -1455,14 +1530,38 @@ skip_tx_iqcal:
3222 +static bool do_ar9003_agc_cal(struct ath_hw *ah)
3224 + struct ath_common *common = ath9k_hw_common(ah);
3227 + REG_WRITE(ah, AR_PHY_AGC_CONTROL,
3228 + REG_READ(ah, AR_PHY_AGC_CONTROL) |
3229 + AR_PHY_AGC_CONTROL_CAL);
3231 + status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
3232 + AR_PHY_AGC_CONTROL_CAL,
3233 + 0, AH_WAIT_TIMEOUT);
3235 + ath_dbg(common, CALIBRATE,
3236 + "offset calibration failed to complete in %d ms,"
3237 + "noisy environment?\n",
3238 + AH_WAIT_TIMEOUT / 1000);
3245 static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
3246 struct ath9k_channel *chan)
3248 struct ath_common *common = ath9k_hw_common(ah);
3249 struct ath9k_hw_cal_data *caldata = ah->caldata;
3250 bool txiqcal_done = false;
3251 - bool is_reusable = true, status = true;
3252 + bool status = true;
3253 bool run_agc_cal = false, sep_iq_cal = false;
3256 /* Use chip chainmask only for calibration */
3257 ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
3258 @@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
3259 * AGC calibration. Specifically, AR9550 in SoC chips.
3261 if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
3262 - txiqcal_done = true;
3263 + if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
3264 + AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
3265 + txiqcal_done = true;
3267 + txiqcal_done = false;
3272 @@ -1512,27 +1616,37 @@ skip_tx_iqcal:
3273 if (AR_SREV_9330_11(ah))
3274 ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
3276 - /* Calibrate the AGC */
3277 - REG_WRITE(ah, AR_PHY_AGC_CONTROL,
3278 - REG_READ(ah, AR_PHY_AGC_CONTROL) |
3279 - AR_PHY_AGC_CONTROL_CAL);
3281 - /* Poll for offset calibration complete */
3282 - status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
3283 - AR_PHY_AGC_CONTROL_CAL,
3284 - 0, AH_WAIT_TIMEOUT);
3287 + * For non-AR9550 chips, we just trigger AGC calibration
3288 + * in the HW, poll for completion and then process
3291 + * For AR955x, we run it multiple times and use
3292 + * median IQ correction.
3294 + if (!AR_SREV_9550(ah)) {
3295 + status = do_ar9003_agc_cal(ah);
3300 - ath_dbg(common, CALIBRATE,
3301 - "offset calibration failed to complete in %d ms; noisy environment?\n",
3302 - AH_WAIT_TIMEOUT / 1000);
3305 + ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
3307 + if (!txiqcal_done) {
3308 + status = do_ar9003_agc_cal(ah);
3312 + for (i = 0; i < MAXIQCAL; i++) {
3313 + status = do_ar9003_agc_cal(ah);
3316 + ar9003_hw_tx_iq_cal_post_proc(ah, i, false);
3323 - ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
3325 /* Revert chainmask to runtime parameters */
3326 ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
3328 --- a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3329 +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
3334 +#include <linux/cache.h>
3336 #include "rtl818x.h"
3339 @@ -139,7 +141,10 @@ struct rtl8187_priv {
3346 + u8 dummy1[L1_CACHE_BYTES];
3347 + } ____cacheline_aligned;
3348 struct sk_buff_head queue;
3349 } b_tx_status; /* This queue is used by both -b and non-b devices */
3350 struct mutex io_mutex;
3351 @@ -147,7 +152,8 @@ struct rtl8187_priv {
3356 + u8 dummy2[L1_CACHE_BYTES];
3357 + } *io_dmabuf ____cacheline_aligned;
3361 --- a/net/mac80211/wme.c
3362 +++ b/net/mac80211/wme.c
3363 @@ -154,6 +154,11 @@ u16 ieee80211_select_queue(struct ieee80
3364 return IEEE80211_AC_BE;
3367 + if (skb->protocol == sdata->control_port_protocol) {
3368 + skb->priority = 7;
3369 + return ieee80211_downgrade_queue(sdata, skb);
3372 /* use the data classifier to determine what 802.1d tag the
3375 --- a/drivers/net/wireless/ath/ath9k/xmit.c
3376 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3377 @@ -1444,14 +1444,16 @@ void ath_tx_aggr_sleep(struct ieee80211_
3378 for (tidno = 0, tid = &an->tid[tidno];
3379 tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
3387 ath_txq_lock(sc, txq);
3389 + if (!tid->sched) {
3390 + ath_txq_unlock(sc, txq);
3394 buffered = ath_tid_has_buffered(tid);
3397 @@ -1696,7 +1698,7 @@ int ath_cabq_update(struct ath_softc *sc
3399 ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi);
3401 - qi.tqi_readyTime = (cur_conf->beacon_interval *
3402 + qi.tqi_readyTime = (TU_TO_USEC(cur_conf->beacon_interval) *
3403 ATH_CABQ_READY_TIME) / 100;
3404 ath_txq_update(sc, qnum, &qi);
3406 @@ -2061,7 +2063,7 @@ static struct ath_buf *ath_tx_setup_buff
3408 ATH_TXBUF_RESET(bf);
3411 + if (tid && ieee80211_is_data_present(hdr->frame_control)) {
3412 fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
3413 seqno = tid->seq_next;
3414 hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
3415 @@ -2184,14 +2186,15 @@ int ath_tx_start(struct ieee80211_hw *hw
3416 txq->stopped = true;
3419 + if (txctl->an && ieee80211_is_data_present(hdr->frame_control))
3420 + tid = ath_get_skb_tid(sc, txctl->an, skb);
3422 if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
3423 ath_txq_unlock(sc, txq);
3424 txq = sc->tx.uapsdq;
3425 ath_txq_lock(sc, txq);
3426 } else if (txctl->an &&
3427 ieee80211_is_data_present(hdr->frame_control)) {
3428 - tid = ath_get_skb_tid(sc, txctl->an, skb);
3430 WARN_ON(tid->ac->txq != txctl->txq);
3432 if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
3433 --- a/drivers/net/wireless/ath/ath9k/init.c
3434 +++ b/drivers/net/wireless/ath/ath9k/init.c
3435 @@ -943,6 +943,7 @@ static void ath9k_set_hw_capab(struct at
3436 hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
3437 hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
3438 hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
3439 + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
3443 --- a/net/mac80211/ieee80211_i.h
3444 +++ b/net/mac80211/ieee80211_i.h
3445 @@ -1700,14 +1700,8 @@ void ieee80211_stop_queue_by_reason(stru
3446 void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);
3447 void ieee80211_add_pending_skb(struct ieee80211_local *local,
3448 struct sk_buff *skb);
3449 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3450 - struct sk_buff_head *skbs,
3451 - void (*fn)(void *data), void *data);
3452 -static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3453 - struct sk_buff_head *skbs)
3455 - ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
3457 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3458 + struct sk_buff_head *skbs);
3459 void ieee80211_flush_queues(struct ieee80211_local *local,
3460 struct ieee80211_sub_if_data *sdata);
3462 --- a/net/mac80211/sta_info.c
3463 +++ b/net/mac80211/sta_info.c
3464 @@ -91,7 +91,7 @@ static int sta_info_hash_del(struct ieee
3468 -static void cleanup_single_sta(struct sta_info *sta)
3469 +static void __cleanup_single_sta(struct sta_info *sta)
3472 struct tid_ampdu_tx *tid_tx;
3473 @@ -99,7 +99,8 @@ static void cleanup_single_sta(struct st
3474 struct ieee80211_local *local = sdata->local;
3477 - if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
3478 + if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
3479 + test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
3480 if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
3481 sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
3482 ps = &sdata->bss->ps;
3483 @@ -109,6 +110,7 @@ static void cleanup_single_sta(struct st
3486 clear_sta_flag(sta, WLAN_STA_PS_STA);
3487 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3489 atomic_dec(&ps->num_sta_ps);
3490 sta_info_recalc_tim(sta);
3491 @@ -139,7 +141,14 @@ static void cleanup_single_sta(struct st
3492 ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
3497 +static void cleanup_single_sta(struct sta_info *sta)
3499 + struct ieee80211_sub_if_data *sdata = sta->sdata;
3500 + struct ieee80211_local *local = sdata->local;
3502 + __cleanup_single_sta(sta);
3503 sta_info_free(local, sta);
3506 @@ -330,6 +339,7 @@ struct sta_info *sta_info_alloc(struct i
3509 spin_lock_init(&sta->lock);
3510 + spin_lock_init(&sta->ps_lock);
3511 INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
3512 INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
3513 mutex_init(&sta->ampdu_mlme.mtx);
3514 @@ -487,21 +497,26 @@ static int sta_info_insert_finish(struct
3518 - /* notify driver */
3519 - err = sta_info_insert_drv_state(local, sdata, sta);
3524 local->sta_generation++;
3527 + /* simplify things and don't accept BA sessions yet */
3528 + set_sta_flag(sta, WLAN_STA_BLOCK_BA);
3530 /* make the station visible */
3531 sta_info_hash_add(local, sta);
3533 list_add_rcu(&sta->list, &local->sta_list);
3535 + /* notify driver */
3536 + err = sta_info_insert_drv_state(local, sdata, sta);
3540 set_sta_flag(sta, WLAN_STA_INSERTED);
3541 + /* accept BA sessions now */
3542 + clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
3544 ieee80211_recalc_min_chandef(sdata);
3545 ieee80211_sta_debugfs_add(sta);
3546 @@ -522,6 +537,12 @@ static int sta_info_insert_finish(struct
3547 mesh_accept_plinks_update(sdata);
3551 + sta_info_hash_del(local, sta);
3552 + list_del_rcu(&sta->list);
3554 + synchronize_net();
3555 + __cleanup_single_sta(sta);
3557 mutex_unlock(&local->sta_mtx);
3559 @@ -1071,10 +1092,14 @@ struct ieee80211_sta *ieee80211_find_sta
3561 EXPORT_SYMBOL(ieee80211_find_sta);
3563 -static void clear_sta_ps_flags(void *_sta)
3564 +/* powersave support code */
3565 +void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3567 - struct sta_info *sta = _sta;
3568 struct ieee80211_sub_if_data *sdata = sta->sdata;
3569 + struct ieee80211_local *local = sdata->local;
3570 + struct sk_buff_head pending;
3571 + int filtered = 0, buffered = 0, ac;
3572 + unsigned long flags;
3575 if (sdata->vif.type == NL80211_IFTYPE_AP ||
3576 @@ -1085,20 +1110,6 @@ static void clear_sta_ps_flags(void *_st
3580 - clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3581 - if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
3582 - atomic_dec(&ps->num_sta_ps);
3585 -/* powersave support code */
3586 -void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
3588 - struct ieee80211_sub_if_data *sdata = sta->sdata;
3589 - struct ieee80211_local *local = sdata->local;
3590 - struct sk_buff_head pending;
3591 - int filtered = 0, buffered = 0, ac;
3592 - unsigned long flags;
3594 clear_sta_flag(sta, WLAN_STA_SP);
3596 BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
3597 @@ -1109,6 +1120,8 @@ void ieee80211_sta_ps_deliver_wakeup(str
3599 skb_queue_head_init(&pending);
3601 + /* sync with ieee80211_tx_h_unicast_ps_buf */
3602 + spin_lock(&sta->ps_lock);
3603 /* Send all buffered frames to the station */
3604 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
3605 int count = skb_queue_len(&pending), tmp;
3606 @@ -1127,7 +1140,12 @@ void ieee80211_sta_ps_deliver_wakeup(str
3607 buffered += tmp - count;
3610 - ieee80211_add_pending_skbs_fn(local, &pending, clear_sta_ps_flags, sta);
3611 + ieee80211_add_pending_skbs(local, &pending);
3612 + clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
3613 + clear_sta_flag(sta, WLAN_STA_PS_STA);
3614 + spin_unlock(&sta->ps_lock);
3616 + atomic_dec(&ps->num_sta_ps);
3618 /* This station just woke up and isn't aware of our SMPS state */
3619 if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,
3620 --- a/net/mac80211/sta_info.h
3621 +++ b/net/mac80211/sta_info.h
3622 @@ -267,6 +267,7 @@ struct ieee80211_tx_latency_stat {
3623 * @drv_unblock_wk: used for driver PS unblocking
3624 * @listen_interval: listen interval of this station, when we're acting as AP
3625 * @_flags: STA flags, see &enum ieee80211_sta_info_flags, do not use directly
3626 + * @ps_lock: used for powersave (when mac80211 is the AP) related locking
3627 * @ps_tx_buf: buffers (per AC) of frames to transmit to this station
3628 * when it leaves power saving state or polls
3629 * @tx_filtered: buffers (per AC) of frames we already tried to
3630 @@ -356,10 +357,8 @@ struct sta_info {
3631 /* use the accessors defined below */
3632 unsigned long _flags;
3635 - * STA powersave frame queues, no more than the internal
3636 - * locking required.
3638 + /* STA powersave lock and frame queues */
3639 + spinlock_t ps_lock;
3640 struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
3641 struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
3642 unsigned long driver_buffered_tids;
3643 --- a/net/mac80211/util.c
3644 +++ b/net/mac80211/util.c
3645 @@ -435,9 +435,8 @@ void ieee80211_add_pending_skb(struct ie
3646 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
3649 -void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
3650 - struct sk_buff_head *skbs,
3651 - void (*fn)(void *data), void *data)
3652 +void ieee80211_add_pending_skbs(struct ieee80211_local *local,
3653 + struct sk_buff_head *skbs)
3655 struct ieee80211_hw *hw = &local->hw;
3656 struct sk_buff *skb;
3657 @@ -461,9 +460,6 @@ void ieee80211_add_pending_skbs_fn(struc
3658 __skb_queue_tail(&local->pending[queue], skb);
3664 for (i = 0; i < hw->queues; i++)
3665 __ieee80211_wake_queue(hw, i,
3666 IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
3667 --- a/net/wireless/reg.c
3668 +++ b/net/wireless/reg.c
3669 @@ -1700,7 +1700,7 @@ static void reg_process_hint(struct regu
3671 case NL80211_REGDOM_SET_BY_USER:
3672 treatment = reg_process_hint_user(reg_request);
3673 - if (treatment == REG_REQ_OK ||
3674 + if (treatment == REG_REQ_IGNORE ||
3675 treatment == REG_REQ_ALREADY_SET)
3677 schedule_delayed_work(®_timeout, msecs_to_jiffies(3142));
3678 --- a/drivers/net/wireless/ath/ath9k/debug.c
3679 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3680 @@ -138,43 +138,41 @@ static ssize_t read_file_ani(struct file
3681 unsigned int len = 0, size = 1024;
3689 + { "ANI RESET", ah->stats.ast_ani_reset },
3690 + { "OFDM LEVEL", ah->ani.ofdmNoiseImmunityLevel },
3691 + { "CCK LEVEL", ah->ani.cckNoiseImmunityLevel },
3692 + { "SPUR UP", ah->stats.ast_ani_spurup },
3693 + { "SPUR DOWN", ah->stats.ast_ani_spurup },
3694 + { "OFDM WS-DET ON", ah->stats.ast_ani_ofdmon },
3695 + { "OFDM WS-DET OFF", ah->stats.ast_ani_ofdmoff },
3696 + { "MRC-CCK ON", ah->stats.ast_ani_ccklow },
3697 + { "MRC-CCK OFF", ah->stats.ast_ani_cckhigh },
3698 + { "FIR-STEP UP", ah->stats.ast_ani_stepup },
3699 + { "FIR-STEP DOWN", ah->stats.ast_ani_stepdown },
3700 + { "INV LISTENTIME", ah->stats.ast_ani_lneg_or_lzero },
3701 + { "OFDM ERRORS", ah->stats.ast_ani_ofdmerrs },
3702 + { "CCK ERRORS", ah->stats.ast_ani_cckerrs },
3705 buf = kzalloc(size, GFP_KERNEL);
3709 - if (common->disable_ani) {
3710 - len += scnprintf(buf + len, size - len, "%s: %s\n",
3711 - "ANI", "DISABLED");
3712 + len += scnprintf(buf + len, size - len, "%15s: %s\n", "ANI",
3713 + common->disable_ani ? "DISABLED" : "ENABLED");
3715 + if (common->disable_ani)
3719 - len += scnprintf(buf + len, size - len, "%15s: %s\n",
3720 - "ANI", "ENABLED");
3721 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3722 - "ANI RESET", ah->stats.ast_ani_reset);
3723 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3724 - "SPUR UP", ah->stats.ast_ani_spurup);
3725 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3726 - "SPUR DOWN", ah->stats.ast_ani_spurup);
3727 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3728 - "OFDM WS-DET ON", ah->stats.ast_ani_ofdmon);
3729 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3730 - "OFDM WS-DET OFF", ah->stats.ast_ani_ofdmoff);
3731 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3732 - "MRC-CCK ON", ah->stats.ast_ani_ccklow);
3733 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3734 - "MRC-CCK OFF", ah->stats.ast_ani_cckhigh);
3735 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3736 - "FIR-STEP UP", ah->stats.ast_ani_stepup);
3737 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3738 - "FIR-STEP DOWN", ah->stats.ast_ani_stepdown);
3739 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3740 - "INV LISTENTIME", ah->stats.ast_ani_lneg_or_lzero);
3741 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3742 - "OFDM ERRORS", ah->stats.ast_ani_ofdmerrs);
3743 - len += scnprintf(buf + len, size - len, "%15s: %u\n",
3744 - "CCK ERRORS", ah->stats.ast_ani_cckerrs);
3745 + for (i = 0; i < ARRAY_SIZE(ani_info); i++)
3746 + len += scnprintf(buf + len, size - len, "%15s: %u\n",
3747 + ani_info[i].name, ani_info[i].val);
3752 @@ -866,6 +864,12 @@ static ssize_t read_file_reset(struct fi
3753 "%17s: %2d\n", "PLL RX Hang",
3754 sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
3755 len += scnprintf(buf + len, sizeof(buf) - len,
3756 + "%17s: %2d\n", "MAC Hang",
3757 + sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
3758 + len += scnprintf(buf + len, sizeof(buf) - len,
3759 + "%17s: %2d\n", "Stuck Beacon",
3760 + sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
3761 + len += scnprintf(buf + len, sizeof(buf) - len,
3762 "%17s: %2d\n", "MCI Reset",
3763 sc->debug.stats.reset[RESET_TYPE_MCI]);
3765 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3766 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
3767 @@ -868,10 +868,6 @@ static void ar9003_hw_set_rfmode(struct
3769 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
3770 rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
3771 - if (IS_CHAN_QUARTER_RATE(chan))
3772 - rfMode |= AR_PHY_MODE_QUARTER;
3773 - if (IS_CHAN_HALF_RATE(chan))
3774 - rfMode |= AR_PHY_MODE_HALF;
3776 if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
3777 REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
3778 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
3779 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
3780 @@ -706,6 +706,7 @@ ath5k_get_survey(struct ieee80211_hw *hw
3781 survey->channel = conf->chandef.chan;
3782 survey->noise = ah->ah_noise_floor;
3783 survey->filled = SURVEY_INFO_NOISE_DBM |
3784 + SURVEY_INFO_IN_USE |
3785 SURVEY_INFO_CHANNEL_TIME |
3786 SURVEY_INFO_CHANNEL_TIME_BUSY |
3787 SURVEY_INFO_CHANNEL_TIME_RX |
3788 --- a/drivers/net/wireless/ath/ath9k/recv.c
3789 +++ b/drivers/net/wireless/ath/ath9k/recv.c
3790 @@ -732,11 +732,18 @@ static struct ath_rxbuf *ath_get_next_rx
3794 - * mark descriptor as zero-length and set the 'more'
3795 - * flag to ensure that both buffers get discarded
3796 + * Re-check previous descriptor, in case it has been filled
3797 + * in the mean time.
3799 - rs->rs_datalen = 0;
3800 - rs->rs_more = true;
3801 + ret = ath9k_hw_rxprocdesc(ah, ds, rs);
3802 + if (ret == -EINPROGRESS) {
3804 + * mark descriptor as zero-length and set the 'more'
3805 + * flag to ensure that both buffers get discarded
3807 + rs->rs_datalen = 0;
3808 + rs->rs_more = true;
3812 list_del(&bf->list);
3813 @@ -985,32 +992,32 @@ static int ath9k_rx_skb_preprocess(struc
3814 struct ath_common *common = ath9k_hw_common(ah);
3815 struct ieee80211_hdr *hdr;
3816 bool discard_current = sc->rx.discard_next;
3820 * Discard corrupt descriptors which are marked in
3821 * ath_get_next_rx_buf().
3823 - sc->rx.discard_next = rx_stats->rs_more;
3824 if (discard_current)
3828 + sc->rx.discard_next = false;
3831 * Discard zero-length packets.
3833 if (!rx_stats->rs_datalen) {
3834 RX_STAT_INC(rx_len_err);
3840 - * rs_status follows rs_datalen so if rs_datalen is too large
3841 - * we can take a hint that hardware corrupted it, so ignore
3845 + * rs_status follows rs_datalen so if rs_datalen is too large
3846 + * we can take a hint that hardware corrupted it, so ignore
3849 if (rx_stats->rs_datalen > (common->rx_bufsize - ah->caps.rx_status_len)) {
3850 RX_STAT_INC(rx_len_err);
3855 /* Only use status info from the last fragment */
3856 @@ -1024,10 +1031,8 @@ static int ath9k_rx_skb_preprocess(struc
3857 * This is different from the other corrupt descriptor
3858 * condition handled above.
3860 - if (rx_stats->rs_status & ATH9K_RXERR_CORRUPT_DESC) {
3864 + if (rx_stats->rs_status & ATH9K_RXERR_CORRUPT_DESC)
3867 hdr = (struct ieee80211_hdr *) (skb->data + ah->caps.rx_status_len);
3869 @@ -1043,18 +1048,15 @@ static int ath9k_rx_skb_preprocess(struc
3870 if (ath_process_fft(sc, hdr, rx_stats, rx_status->mactime))
3871 RX_STAT_INC(rx_spectral);
3879 * everything but the rate is checked here, the rate check is done
3880 * separately to avoid doing two lookups for a rate for each frame.
3882 - if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error)) {
3886 + if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
3889 if (ath_is_mybeacon(common, hdr)) {
3890 RX_STAT_INC(rx_beacons);
3891 @@ -1064,15 +1066,11 @@ static int ath9k_rx_skb_preprocess(struc
3893 * This shouldn't happen, but have a safety check anyway.
3895 - if (WARN_ON(!ah->curchan)) {
3899 + if (WARN_ON(!ah->curchan))
3902 - if (ath9k_process_rate(common, hw, rx_stats, rx_status)) {
3906 + if (ath9k_process_rate(common, hw, rx_stats, rx_status))
3909 ath9k_process_rssi(common, hw, rx_stats, rx_status);
3911 @@ -1087,9 +1085,11 @@ static int ath9k_rx_skb_preprocess(struc
3916 - sc->rx.discard_next = false;
3921 + sc->rx.discard_next = rx_stats->rs_more;
3925 static void ath9k_rx_skb_postprocess(struct ath_common *common,
3926 --- a/drivers/net/wireless/ath/ath9k/ani.c
3927 +++ b/drivers/net/wireless/ath/ath9k/ani.c
3928 @@ -176,16 +176,26 @@ static void ath9k_hw_set_ofdm_nil(struct
3929 if (ah->opmode == NL80211_IFTYPE_STATION &&
3930 BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_HIGH)
3934 - * OFDM Weak signal detection is always enabled for AP mode.
3935 + * Newer chipsets are better at dealing with high PHY error counts -
3936 + * keep weak signal detection enabled when no RSSI threshold is
3937 + * available to determine if it is needed (mode != STA)
3939 - if (ah->opmode != NL80211_IFTYPE_AP &&
3940 - aniState->ofdmWeakSigDetect != weak_sig) {
3941 - ath9k_hw_ani_control(ah,
3942 - ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
3943 - entry_ofdm->ofdm_weak_signal_on);
3945 + else if (AR_SREV_9300_20_OR_LATER(ah) &&
3946 + ah->opmode != NL80211_IFTYPE_STATION)
3949 + /* Older chipsets are more sensitive to high PHY error counts */
3950 + else if (!AR_SREV_9300_20_OR_LATER(ah) &&
3951 + aniState->ofdmNoiseImmunityLevel >= 8)
3954 + if (aniState->ofdmWeakSigDetect != weak_sig)
3955 + ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
3958 + if (!AR_SREV_9300_20_OR_LATER(ah))
3961 if (aniState->ofdmNoiseImmunityLevel >= ATH9K_ANI_OFDM_DEF_LEVEL) {
3962 ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3963 @@ -308,17 +318,6 @@ void ath9k_ani_reset(struct ath_hw *ah,
3964 BUG_ON(aniState == NULL);
3965 ah->stats.ast_ani_reset++;
3967 - /* only allow a subset of functions in AP mode */
3968 - if (ah->opmode == NL80211_IFTYPE_AP) {
3969 - if (IS_CHAN_2GHZ(chan)) {
3970 - ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
3971 - ATH9K_ANI_FIRSTEP_LEVEL);
3972 - if (AR_SREV_9300_20_OR_LATER(ah))
3973 - ah->ani_function |= ATH9K_ANI_MRC_CCK;
3975 - ah->ani_function = 0;
3978 ofdm_nil = max_t(int, ATH9K_ANI_OFDM_DEF_LEVEL,
3979 aniState->ofdmNoiseImmunityLevel);
3980 cck_nil = max_t(int, ATH9K_ANI_CCK_DEF_LEVEL,
3981 @@ -483,10 +482,17 @@ void ath9k_hw_ani_init(struct ath_hw *ah
3983 ath_dbg(common, ANI, "Initialize ANI\n");
3985 - ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3986 - ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
3987 - ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
3988 - ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
3989 + if (AR_SREV_9300_20_OR_LATER(ah)) {
3990 + ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
3991 + ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
3992 + ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
3993 + ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
3995 + ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
3996 + ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
3997 + ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
3998 + ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_OLD;
4001 ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
4002 ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
4003 --- a/drivers/net/wireless/ath/ath9k/ani.h
4004 +++ b/drivers/net/wireless/ath/ath9k/ani.h
4006 /* units are errors per second */
4007 #define ATH9K_ANI_OFDM_TRIG_HIGH 3500
4008 #define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
4009 +#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD 500
4011 #define ATH9K_ANI_OFDM_TRIG_LOW 400
4012 #define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
4013 +#define ATH9K_ANI_OFDM_TRIG_LOW_OLD 200
4015 #define ATH9K_ANI_CCK_TRIG_HIGH 600
4016 +#define ATH9K_ANI_CCK_TRIG_HIGH_OLD 200
4017 #define ATH9K_ANI_CCK_TRIG_LOW 300
4018 +#define ATH9K_ANI_CCK_TRIG_LOW_OLD 100
4020 #define ATH9K_ANI_SPUR_IMMUNE_LVL 3
4021 #define ATH9K_ANI_FIRSTEP_LVL 2
4022 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
4023 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
4024 @@ -26,10 +26,6 @@ static const int firstep_table[] =
4025 /* level: 0 1 2 3 4 5 6 7 8 */
4026 { -4, -2, 0, 2, 4, 6, 8, 10, 12 }; /* lvl 0-8, default 2 */
4028 -static const int cycpwrThr1_table[] =
4029 -/* level: 0 1 2 3 4 5 6 7 8 */
4030 - { -6, -4, -2, 0, 2, 4, 6, 8 }; /* lvl 0-7, default 3 */
4033 * register values to turn OFDM weak signal detection OFF
4035 @@ -921,7 +917,7 @@ static bool ar5008_hw_ani_control_new(st
4036 struct ath_common *common = ath9k_hw_common(ah);
4037 struct ath9k_channel *chan = ah->curchan;
4038 struct ar5416AniState *aniState = &ah->ani;
4039 - s32 value, value2;
4042 switch (cmd & ah->ani_function) {
4043 case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
4044 @@ -1008,42 +1004,9 @@ static bool ar5008_hw_ani_control_new(st
4045 case ATH9K_ANI_FIRSTEP_LEVEL:{
4048 - if (level >= ARRAY_SIZE(firstep_table)) {
4049 - ath_dbg(common, ANI,
4050 - "ATH9K_ANI_FIRSTEP_LEVEL: level out of range (%u > %zu)\n",
4051 - level, ARRAY_SIZE(firstep_table));
4056 - * make register setting relative to default
4057 - * from INI file & cap value
4059 - value = firstep_table[level] -
4060 - firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
4061 - aniState->iniDef.firstep;
4062 - if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
4063 - value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
4064 - if (value > ATH9K_SIG_FIRSTEP_SETTING_MAX)
4065 - value = ATH9K_SIG_FIRSTEP_SETTING_MAX;
4067 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
4068 - AR_PHY_FIND_SIG_FIRSTEP,
4071 - * we need to set first step low register too
4072 - * make register setting relative to default
4073 - * from INI file & cap value
4075 - value2 = firstep_table[level] -
4076 - firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
4077 - aniState->iniDef.firstepLow;
4078 - if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
4079 - value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
4080 - if (value2 > ATH9K_SIG_FIRSTEP_SETTING_MAX)
4081 - value2 = ATH9K_SIG_FIRSTEP_SETTING_MAX;
4083 - REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
4084 - AR_PHY_FIND_SIG_FIRSTEP_LOW, value2);
4085 + AR_PHY_FIND_SIG_FIRSTEP, value);
4087 if (level != aniState->firstepLevel) {
4088 ath_dbg(common, ANI,
4089 @@ -1060,7 +1023,7 @@ static bool ar5008_hw_ani_control_new(st
4090 aniState->firstepLevel,
4092 ATH9K_ANI_FIRSTEP_LVL,
4095 aniState->iniDef.firstepLow);
4096 if (level > aniState->firstepLevel)
4097 ah->stats.ast_ani_stepup++;
4098 @@ -1073,41 +1036,13 @@ static bool ar5008_hw_ani_control_new(st
4099 case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
4102 - if (level >= ARRAY_SIZE(cycpwrThr1_table)) {
4103 - ath_dbg(common, ANI,
4104 - "ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level out of range (%u > %zu)\n",
4105 - level, ARRAY_SIZE(cycpwrThr1_table));
4109 - * make register setting relative to default
4110 - * from INI file & cap value
4112 - value = cycpwrThr1_table[level] -
4113 - cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
4114 - aniState->iniDef.cycpwrThr1;
4115 - if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
4116 - value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
4117 - if (value > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
4118 - value = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
4119 + value = (level + 1) * 2;
4120 REG_RMW_FIELD(ah, AR_PHY_TIMING5,
4121 - AR_PHY_TIMING5_CYCPWR_THR1,
4123 + AR_PHY_TIMING5_CYCPWR_THR1, value);
4126 - * set AR_PHY_EXT_CCA for extension channel
4127 - * make register setting relative to default
4128 - * from INI file & cap value
4130 - value2 = cycpwrThr1_table[level] -
4131 - cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
4132 - aniState->iniDef.cycpwrThr1Ext;
4133 - if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
4134 - value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
4135 - if (value2 > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
4136 - value2 = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
4137 - REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
4138 - AR_PHY_EXT_TIMING5_CYCPWR_THR1, value2);
4139 + if (IS_CHAN_HT40(ah->curchan))
4140 + REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
4141 + AR_PHY_EXT_TIMING5_CYCPWR_THR1, value);
4143 if (level != aniState->spurImmunityLevel) {
4144 ath_dbg(common, ANI,
4145 @@ -1124,7 +1059,7 @@ static bool ar5008_hw_ani_control_new(st
4146 aniState->spurImmunityLevel,
4148 ATH9K_ANI_SPUR_IMMUNE_LVL,
4151 aniState->iniDef.cycpwrThr1Ext);
4152 if (level > aniState->spurImmunityLevel)
4153 ah->stats.ast_ani_spurup++;
projects / openwrt / svn-archive / archive.git / blob