2014-02-07 18:08:57 +00:00
|
|
|
|
commit e2f141d67ad1e7fe10aaab61811e8a409dfb2442
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:55 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Calculate IQ-CAL median
|
|
|
|
|
|
|
|
|
|
|
|
This patch adds a routine to calculate the median IQ correction
|
|
|
|
|
|
values for AR955x, which is used for outlier detection.
|
|
|
|
|
|
The normal method which is used for all other chips is
|
|
|
|
|
|
bypassed for AR955x.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit c52a6fce0820c8d0687443ab86058ae03b478c8f
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:54 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Expand the IQ coefficient array
|
|
|
|
|
|
|
|
|
|
|
|
This will be used for storing data for mutiple
|
|
|
|
|
|
IQ calibration runs, for AR955x.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 034969ff5c2b6431d10e07c1938f0b916da85cc3
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:53 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Modify IQ calibration for AR955x
|
|
|
|
|
|
|
|
|
|
|
|
IQ calibration post-processing for AR955x is different
|
|
|
|
|
|
from other chips - instead of just doing it as part
|
|
|
|
|
|
of AGC calibration once, it is triggered 3 times and
|
|
|
|
|
|
a median is determined. This patch adds initial support
|
|
|
|
|
|
for changing the calibration behavior for AR955x.
|
|
|
|
|
|
|
|
|
|
|
|
Also, to simplify things, a helper routine to issue/poll
|
|
|
|
|
|
AGC calibration is used.
|
|
|
|
|
|
|
|
|
|
|
|
For non-AR955x chips, the iqcal_idx (which will be used
|
|
|
|
|
|
in subsequent patches) is set to zero.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 9b1ed6454e6f3511f24266be99b4e403f243f6a8
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:52 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Fix magnitude/phase calculation
|
|
|
|
|
|
|
|
|
|
|
|
Incorrect values are programmed in the registers
|
|
|
|
|
|
containing the IQ correction coefficients by the IQ-CAL
|
|
|
|
|
|
post-processing code. Fix this.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 36f93484f96f79171dcecb67c5ef0c3de22531a6
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:51 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Rename ar9003_hw_tx_iqcal_load_avg_2_passes
|
|
|
|
|
|
|
|
|
|
|
|
Use ar9003_hw_tx_iq_cal_outlier_detection instead.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 3af09a7f5d21dd5fd15b973ce6a91a575da30417
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:50 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Check explicitly for IQ calibration
|
|
|
|
|
|
|
|
|
|
|
|
In chips like AR955x, the initvals contain the information
|
|
|
|
|
|
whether IQ calibration is to be done in the HW when an
|
|
|
|
|
|
AGC calibration is triggered. Check if IQ-CAL is enabled
|
|
|
|
|
|
in the initvals before flagging 'txiqcal_done' as true.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit cb4969634b93c4643a32cc3fbd27d2b288b25771
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Fri Feb 7 10:29:49 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Fix IQ cal post processing for SoC
|
|
|
|
|
|
|
|
|
|
|
|
Calibration data is not reused for SoC chips, so
|
|
|
|
|
|
call ar9003_hw_tx_iq_cal_post_proc() with the correct
|
|
|
|
|
|
argument. The 'is_reusable' flag is currently used
|
|
|
|
|
|
only for PC-OEM chips, but it makes things clearer to
|
|
|
|
|
|
specify it explicity.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
2014-02-03 10:53:24 +00:00
|
|
|
|
commit e138e0ef9560c46ce93dbb22a728a57888e94d1c
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Mon Feb 3 13:31:37 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Fix TX power calculation
|
|
|
|
|
|
|
|
|
|
|
|
The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template"
|
|
|
|
|
|
fixed the incorrect values in the eeprom templates, but if
|
|
|
|
|
|
boards have already been calibrated with incorrect values,
|
|
|
|
|
|
they would still be using the wrong TX power. Fix this by assigning
|
|
|
|
|
|
a default value in such cases.
|
|
|
|
|
|
|
|
|
|
|
|
Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
2014-02-01 15:33:04 +00:00
|
|
|
|
commit b9f268b5b01331c3c82179abca551429450e9417
|
|
|
|
|
|
Author: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Date: Wed Jan 29 14:22:27 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: consider existing DFS interfaces
|
|
|
|
|
|
|
|
|
|
|
|
It was possible to break interface combinations in
|
|
|
|
|
|
the following way:
|
|
|
|
|
|
|
|
|
|
|
|
combo 1: iftype = AP, num_ifaces = 2, num_chans = 2,
|
|
|
|
|
|
combo 2: iftype = AP, num_ifaces = 1, num_chans = 1, radar = HT20
|
|
|
|
|
|
|
|
|
|
|
|
With the above interface combinations it was
|
|
|
|
|
|
possible to:
|
|
|
|
|
|
|
|
|
|
|
|
step 1. start AP on DFS channel by matching combo 2
|
|
|
|
|
|
step 2. start AP on non-DFS channel by matching combo 1
|
|
|
|
|
|
|
|
|
|
|
|
This was possible beacuse (step 2) did not consider
|
|
|
|
|
|
if other interfaces require radar detection.
|
|
|
|
|
|
|
|
|
|
|
|
The patch changes how cfg80211 tracks channels -
|
|
|
|
|
|
instead of channel itself now a complete chandef
|
|
|
|
|
|
is stored.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit bc9c62f5f511cc395c62dbf4cdd437f23db53b28
|
|
|
|
|
|
Author: Antonio Quartulli <antonio@open-mesh.com>
|
|
|
|
|
|
Date: Wed Jan 29 17:53:43 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: fix channel configuration in IBSS join
|
|
|
|
|
|
|
|
|
|
|
|
When receiving an IBSS_JOINED event select the BSS object
|
|
|
|
|
|
based on the {bssid, channel} couple rather than the bssid
|
|
|
|
|
|
only.
|
|
|
|
|
|
With the current approach if another cell having the same
|
|
|
|
|
|
BSSID (but using a different channel) exists then cfg80211
|
|
|
|
|
|
picks up the wrong BSS object.
|
|
|
|
|
|
The result is a mismatching channel configuration between
|
|
|
|
|
|
cfg80211 and the driver, that can lead to any sort of
|
|
|
|
|
|
problem.
|
|
|
|
|
|
|
|
|
|
|
|
The issue can be triggered by having an IBSS sitting on
|
|
|
|
|
|
given channel and then asking the driver to create a new
|
|
|
|
|
|
cell using the same BSSID but with a different frequency.
|
|
|
|
|
|
By passing the channel to cfg80211_get_bss() we can solve
|
|
|
|
|
|
this ambiguity and retrieve/create the correct BSS object.
|
|
|
|
|
|
All the users of cfg80211_ibss_joined() have been changed
|
|
|
|
|
|
accordingly.
|
|
|
|
|
|
|
|
|
|
|
|
Moreover WARN when cfg80211_ibss_joined() gets a NULL
|
|
|
|
|
|
channel as argument and remove a bogus call of the same
|
|
|
|
|
|
function in ath6kl (it does not make sense to call
|
|
|
|
|
|
cfg80211_ibss_joined() with a zero BSSID on ibss-leave).
|
|
|
|
|
|
|
|
|
|
|
|
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
|
|
|
|
|
|
Cc: Arend van Spriel <arend@broadcom.com>
|
|
|
|
|
|
Cc: Bing Zhao <bzhao@marvell.com>
|
|
|
|
|
|
Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
|
|
|
|
|
Cc: libertas-dev@lists.infradead.org
|
|
|
|
|
|
Acked-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
|
|
|
|
|
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
|
|
|
|
|
|
[minor code cleanup in ath6kl]
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 7e0c41cb41f215aba2c39b1c237bb4d42ec49a85
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Fri Jan 24 14:41:44 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: fix bufferable MMPDU RX handling
|
|
|
|
|
|
|
|
|
|
|
|
Action, disassoc and deauth frames are bufferable, and as such don't
|
|
|
|
|
|
have the PM bit in the frame control field reserved which means we
|
|
|
|
|
|
need to react to the bit when receiving in such a frame.
|
|
|
|
|
|
|
|
|
|
|
|
Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
|
|
|
|
|
|
and using it for the RX path that currently ignores the PM bit in
|
|
|
|
|
|
any non-data frames for doze->wake transitions, but listens to it in
|
|
|
|
|
|
all frames for wake->doze transitions, both of which are wrong.
|
|
|
|
|
|
|
|
|
|
|
|
Also use the new helper in the TX path to clean up the code.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit fc0df6d2343636e3f48a069330d5b972e3d8659d
|
|
|
|
|
|
Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
|
|
|
|
|
|
Date: Fri Jan 24 14:29:21 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: set preset_chandef after channel switch
|
|
|
|
|
|
|
|
|
|
|
|
Set preset_chandef in channel switch notification.
|
|
|
|
|
|
In other case we will have old preset_chandef.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit cdec895e2344987ff171cece96e25d7407a3ebf6
|
|
|
|
|
|
Author: Simon Wunderlich <simon@open-mesh.com>
|
|
|
|
|
|
Date: Fri Jan 24 23:48:29 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: send ibss probe responses with noack flag
|
|
|
|
|
|
|
|
|
|
|
|
Responding to probe requests for scanning clients will often create
|
|
|
|
|
|
excessive retries, as it happens quite often that the scanning client
|
|
|
|
|
|
already left the channel. Therefore do it like hostapd and send probe
|
|
|
|
|
|
responses for wildcard SSID only once by using the noack flag.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
|
|
|
|
|
|
[fix typo & 'wildcard SSID' in commit log]
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 0b865d1e6b9c05052adae9315df7cb195dc60c3b
|
|
|
|
|
|
Author: Luciano Coelho <luciano.coelho@intel.com>
|
|
|
|
|
|
Date: Tue Jan 28 17:09:08 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: ibss: remove unnecessary call to release channel
|
|
|
|
|
|
|
|
|
|
|
|
The ieee80211_vif_use_channel() function calls
|
|
|
|
|
|
ieee80211_vif_release_channel(), so there's no need to call it
|
|
|
|
|
|
explicitly in __ieee80211_sta_join_ibss().
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit e1b6c17e971f0a51ff86c2dac2584c63cd999cd7
|
|
|
|
|
|
Author: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Date: Wed Jan 29 07:56:21 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: add missing CSA locking
|
|
|
|
|
|
|
|
|
|
|
|
The patch adds a missing sdata lock and adds a few
|
|
|
|
|
|
lockdeps for easier maintenance.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit ad17ba7d14d225b109b73c177cd446afb8050598
|
|
|
|
|
|
Author: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Date: Wed Jan 29 07:56:20 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: fix sdata->radar_required locking
|
|
|
|
|
|
|
|
|
|
|
|
radar_required setting wasn't protected by
|
|
|
|
|
|
local->mtx in some places. This should prevent
|
|
|
|
|
|
from scanning/radar detection/roc colliding.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 5fcd5f1808813a3d9e502fd756e01bee8a79c85d
|
|
|
|
|
|
Author: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Date: Wed Jan 29 07:56:19 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: move csa_active setting in STA CSA
|
|
|
|
|
|
|
|
|
|
|
|
The sdata->vif.csa_active could be left set after,
|
|
|
|
|
|
e.g. channel context constraints check fail in STA
|
|
|
|
|
|
mode leaving the interface in a strange state for
|
|
|
|
|
|
a brief period of time until it is disconnected.
|
|
|
|
|
|
This was harmless but ugly.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit e486da4b7eed71821c6b4c1bb9ac62ffd3ab13e9
|
|
|
|
|
|
Author: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Date: Wed Jan 29 07:56:18 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: fix possible memory leak on AP CSA failure
|
|
|
|
|
|
|
|
|
|
|
|
If CSA for AP interface failed and the interface
|
|
|
|
|
|
was not stopped afterwards another CSA request
|
|
|
|
|
|
would leak sdata->u.ap.next_beacon.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
|
|
|
|
|
|
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 3a77ba08940682bf3d52cf14f980337324af9d4a
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Sat Feb 1 00:33:29 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: fix fragmentation code, particularly for encryption
|
|
|
|
|
|
|
|
|
|
|
|
The "new" fragmentation code (since my rewrite almost 5 years ago)
|
|
|
|
|
|
erroneously sets skb->len rather than using skb_trim() to adjust
|
|
|
|
|
|
the length of the first fragment after copying out all the others.
|
|
|
|
|
|
This leaves the skb tail pointer pointing to after where the data
|
|
|
|
|
|
originally ended, and thus causes the encryption MIC to be written
|
|
|
|
|
|
at that point, rather than where it belongs: immediately after the
|
|
|
|
|
|
data.
|
|
|
|
|
|
|
|
|
|
|
|
The impact of this is that if software encryption is done, then
|
|
|
|
|
|
a) encryption doesn't work for the first fragment, the connection
|
|
|
|
|
|
becomes unusable as the first fragment will never be properly
|
|
|
|
|
|
verified at the receiver, the MIC is practically guaranteed to
|
|
|
|
|
|
be wrong
|
|
|
|
|
|
b) we leak up to 8 bytes of plaintext (!) of the packet out into
|
|
|
|
|
|
the air
|
|
|
|
|
|
|
|
|
|
|
|
This is only mitigated by the fact that many devices are capable
|
|
|
|
|
|
of doing encryption in hardware, in which case this can't happen
|
|
|
|
|
|
as the tail pointer is irrelevant in that case. Additionally,
|
|
|
|
|
|
fragmentation is not used very frequently and would normally have
|
|
|
|
|
|
to be configured manually.
|
|
|
|
|
|
|
|
|
|
|
|
Fix this by using skb_trim() properly.
|
|
|
|
|
|
|
|
|
|
|
|
Cc: stable@vger.kernel.org
|
|
|
|
|
|
Fixes: 2de8e0d999b8 ("mac80211: rewrite fragmentation")
|
|
|
|
|
|
Reported-by: Jouni Malinen <j@w1.fi>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
commit de5f242e0c10e841017e37eb8c38974a642dbca8
|
|
|
|
|
|
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
Date: Tue Jan 28 06:21:59 2014 +0530
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Fix build error on ARM
|
|
|
|
|
|
|
|
|
|
|
|
Use mdelay instead of udelay to fix this error:
|
|
|
|
|
|
|
|
|
|
|
|
ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
|
|
|
|
|
|
make[1]: *** [__modpost] Error 1
|
|
|
|
|
|
make: *** [modules] Error 2
|
|
|
|
|
|
|
|
|
|
|
|
Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|
|
|
|
|
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 8e3ea7a51dfc61810fcefd947f6edcf61125252a
|
|
|
|
|
|
Author: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
|
|
|
|
Date: Sun Jan 26 11:53:21 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
ath9k: Fix uninitialized variable in ath9k_has_tx_pending()
|
|
|
|
|
|
|
|
|
|
|
|
drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_has_tx_pending’:
|
|
|
|
|
|
drivers/net/wireless/ath/ath9k/main.c:1869: warning: ‘npend’ may be used uninitialized in this function
|
|
|
|
|
|
|
|
|
|
|
|
Introduced by commit 10e2318103f5941aa70c318afe34bc41f1b98529 ("ath9k:
|
|
|
|
|
|
optimize ath9k_flush").
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
|
|
|
|
|
|
|
|
|
|
commit a4a634a6937ebdd827fa58e8fcdb8ca49a3769f6
|
|
|
|
|
|
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
|
|
|
Date: Mon Jan 27 11:07:42 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: release the channel in error path in start_ap
|
|
|
|
|
|
|
|
|
|
|
|
When the driver cannot start the AP or when the assignement
|
|
|
|
|
|
of the beacon goes wrong, we need to unassign the vif.
|
|
|
|
|
|
|
|
|
|
|
|
Cc: stable@vger.kernel.org
|
|
|
|
|
|
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit dfb6889a75c601aedb7450b7e606668e77da6679
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Wed Jan 22 11:14:19 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: send scan results from work queue
|
|
|
|
|
|
|
|
|
|
|
|
Due to the previous commit, when a scan finishes, it is in theory
|
|
|
|
|
|
possible to hit the following sequence:
|
|
|
|
|
|
1. interface starts being removed
|
|
|
|
|
|
2. scan is cancelled by driver and cfg80211 is notified
|
|
|
|
|
|
3. scan done work is scheduled
|
|
|
|
|
|
4. interface is removed completely, rdev->scan_req is freed,
|
|
|
|
|
|
event sent to userspace but scan done work remains pending
|
|
|
|
|
|
5. new scan is requested on another virtual interface
|
|
|
|
|
|
6. scan done work runs, freeing the still-running scan
|
|
|
|
|
|
|
|
|
|
|
|
To fix this situation, hang on to the scan done message and block
|
|
|
|
|
|
new scans while that is the case, and only send the message from
|
|
|
|
|
|
the work function, regardless of whether the scan_req is already
|
|
|
|
|
|
freed from interface removal. This makes step 5 above impossible
|
|
|
|
|
|
and changes step 6 to be
|
|
|
|
|
|
5. scan done work runs, sending the scan done message
|
|
|
|
|
|
|
|
|
|
|
|
As this can't work for wext, so we send the message immediately,
|
|
|
|
|
|
but this shouldn't be an issue since we still return -EBUSY.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 45b7ab41fc08627d9a8428cb413d5d84662a9707
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Wed Jan 22 11:14:18 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: fix scan done race
|
|
|
|
|
|
|
|
|
|
|
|
When an interface/wdev is removed, any ongoing scan should be
|
|
|
|
|
|
cancelled by the driver. This will make it call cfg80211, which
|
|
|
|
|
|
only queues a work struct. If interface/wdev removal is quick
|
|
|
|
|
|
enough, this can leave the scan request pending and processed
|
|
|
|
|
|
only after the interface is gone, causing a use-after-free.
|
|
|
|
|
|
|
|
|
|
|
|
Fix this by making sure the scan request is not pending after
|
|
|
|
|
|
the interface is destroyed. We can't flush or cancel the work
|
|
|
|
|
|
item due to locking concerns, but when it'll run it shouldn't
|
|
|
|
|
|
find anything to do. This leaves a potential issue, if a new
|
|
|
|
|
|
scan gets requested before the work runs, it prematurely stops
|
|
|
|
|
|
the running scan, potentially causing another crash. I'll fix
|
|
|
|
|
|
that in the next patch.
|
|
|
|
|
|
|
|
|
|
|
|
This was particularly observed with P2P_DEVICE wdevs, likely
|
|
|
|
|
|
because freeing them is quicker than freeing netdevs.
|
|
|
|
|
|
|
|
|
|
|
|
Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
|
|
|
|
|
|
Fixes: 4a58e7c38443 ("cfg80211: don't "leak" uncompleted scans")
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit ae04fa489ab31b5a10d3cc8399f52761175d4321
|
|
|
|
|
|
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
|
|
|
Date: Thu Jan 23 14:28:16 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: avoid deadlock revealed by lockdep
|
|
|
|
|
|
|
|
|
|
|
|
sdata->u.ap.request_smps_work can’t be flushed synchronously
|
|
|
|
|
|
under wdev_lock(wdev) since ieee80211_request_smps_ap_work
|
|
|
|
|
|
itself locks the same lock.
|
|
|
|
|
|
While at it, reset the driver_smps_mode when the ap is
|
|
|
|
|
|
stopped to its default: OFF.
|
|
|
|
|
|
|
|
|
|
|
|
This solves:
|
|
|
|
|
|
|
|
|
|
|
|
======================================================
|
|
|
|
|
|
[ INFO: possible circular locking dependency detected ]
|
|
|
|
|
|
3.12.0-ipeer+ #2 Tainted: G O
|
|
|
|
|
|
-------------------------------------------------------
|
|
|
|
|
|
rmmod/2867 is trying to acquire lock:
|
|
|
|
|
|
((&sdata->u.ap.request_smps_work)){+.+...}, at: [<c105b8d0>] flush_work+0x0/0x90
|
|
|
|
|
|
|
|
|
|
|
|
but task is already holding lock:
|
|
|
|
|
|
(&wdev->mtx){+.+.+.}, at: [<f9b32626>] cfg80211_stop_ap+0x26/0x230 [cfg80211]
|
|
|
|
|
|
|
|
|
|
|
|
which lock already depends on the new lock.
|
|
|
|
|
|
|
|
|
|
|
|
the existing dependency chain (in reverse order) is:
|
|
|
|
|
|
|
|
|
|
|
|
-> #1 (&wdev->mtx){+.+.+.}:
|
|
|
|
|
|
[<c10aefa9>] lock_acquire+0x79/0xe0
|
|
|
|
|
|
[<c1607a1a>] mutex_lock_nested+0x4a/0x360
|
|
|
|
|
|
[<fb06288b>] ieee80211_request_smps_ap_work+0x2b/0x50 [mac80211]
|
|
|
|
|
|
[<c105cdd8>] process_one_work+0x198/0x450
|
|
|
|
|
|
[<c105d469>] worker_thread+0xf9/0x320
|
|
|
|
|
|
[<c10669ff>] kthread+0x9f/0xb0
|
|
|
|
|
|
[<c1613397>] ret_from_kernel_thread+0x1b/0x28
|
|
|
|
|
|
|
|
|
|
|
|
-> #0 ((&sdata->u.ap.request_smps_work)){+.+...}:
|
|
|
|
|
|
[<c10ae9df>] __lock_acquire+0x183f/0x1910
|
|
|
|
|
|
[<c10aefa9>] lock_acquire+0x79/0xe0
|
|
|
|
|
|
[<c105b917>] flush_work+0x47/0x90
|
|
|
|
|
|
[<c105d867>] __cancel_work_timer+0x67/0xe0
|
|
|
|
|
|
[<c105d90f>] cancel_work_sync+0xf/0x20
|
|
|
|
|
|
[<fb0765cc>] ieee80211_stop_ap+0x8c/0x340 [mac80211]
|
|
|
|
|
|
[<f9b3268c>] cfg80211_stop_ap+0x8c/0x230 [cfg80211]
|
|
|
|
|
|
[<f9b0d8f9>] cfg80211_leave+0x79/0x100 [cfg80211]
|
|
|
|
|
|
[<f9b0da72>] cfg80211_netdev_notifier_call+0xf2/0x4f0 [cfg80211]
|
|
|
|
|
|
[<c160f2c9>] notifier_call_chain+0x59/0x130
|
|
|
|
|
|
[<c106c6de>] __raw_notifier_call_chain+0x1e/0x30
|
|
|
|
|
|
[<c106c70f>] raw_notifier_call_chain+0x1f/0x30
|
|
|
|
|
|
[<c14f8213>] call_netdevice_notifiers_info+0x33/0x70
|
|
|
|
|
|
[<c14f8263>] call_netdevice_notifiers+0x13/0x20
|
|
|
|
|
|
[<c14f82a4>] __dev_close_many+0x34/0xb0
|
|
|
|
|
|
[<c14f83fe>] dev_close_many+0x6e/0xc0
|
|
|
|
|
|
[<c14f9c77>] rollback_registered_many+0xa7/0x1f0
|
|
|
|
|
|
[<c14f9dd4>] unregister_netdevice_many+0x14/0x60
|
|
|
|
|
|
[<fb06f4d9>] ieee80211_remove_interfaces+0xe9/0x170 [mac80211]
|
|
|
|
|
|
[<fb055116>] ieee80211_unregister_hw+0x56/0x110 [mac80211]
|
|
|
|
|
|
[<fa3e9396>] iwl_op_mode_mvm_stop+0x26/0xe0 [iwlmvm]
|
|
|
|
|
|
[<f9b9d8ca>] _iwl_op_mode_stop+0x3a/0x70 [iwlwifi]
|
|
|
|
|
|
[<f9b9d96f>] iwl_opmode_deregister+0x6f/0x90 [iwlwifi]
|
|
|
|
|
|
[<fa405179>] __exit_compat+0xd/0x19 [iwlmvm]
|
|
|
|
|
|
[<c10b8bf9>] SyS_delete_module+0x179/0x2b0
|
|
|
|
|
|
[<c1613421>] sysenter_do_call+0x12/0x32
|
|
|
|
|
|
|
|
|
|
|
|
Fixes: 687da132234f ("mac80211: implement SMPS for AP")
|
|
|
|
|
|
Cc: <stable@vger.kernel.org> [3.13]
|
|
|
|
|
|
Reported-by: Ilan Peer <ilan.peer@intel.com>
|
|
|
|
|
|
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 178b205e96217164fd7c30113464250d0b6f5eca
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Thu Jan 23 16:32:29 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
cfg80211: re-enable 5/10 MHz support
|
|
|
|
|
|
|
|
|
|
|
|
Unfortunately I forgot this during the merge window, but the
|
|
|
|
|
|
patch seems small enough to go in as a fix. The userspace API
|
|
|
|
|
|
bug that was the reason for disabling it has long been fixed.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 110a1c79acda14edc83b7c8dc5af9c7ddd23eb61
|
|
|
|
|
|
Author: Pontus Fuchs <pontus.fuchs@gmail.com>
|
|
|
|
|
|
Date: Thu Jan 16 15:00:40 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
nl80211: Reset split_start when netlink skb is exhausted
|
|
|
|
|
|
|
|
|
|
|
|
When the netlink skb is exhausted split_start is left set. In the
|
|
|
|
|
|
subsequent retry, with a larger buffer, the dump is continued from the
|
|
|
|
|
|
failing point instead of from the beginning.
|
|
|
|
|
|
|
|
|
|
|
|
This was causing my rt28xx based USB dongle to now show up when
|
|
|
|
|
|
running "iw list" with an old iw version without split dump support.
|
|
|
|
|
|
|
|
|
|
|
|
Cc: stable@vger.kernel.org
|
|
|
|
|
|
Fixes: 3713b4e364ef ("nl80211: allow splitting wiphy information in dumps")
|
|
|
|
|
|
Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
|
|
|
|
|
|
[avoid the entire workaround when state->split is set]
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit b4c31b45ffc7ef110fa9ecc34d7878fe7c5b9da4
|
|
|
|
|
|
Author: Eliad Peller <eliad@wizery.com>
|
|
|
|
|
|
Date: Sun Jan 12 11:06:37 2014 +0200
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: move roc cookie assignment earlier
|
|
|
|
|
|
|
|
|
|
|
|
ieee80211_start_roc_work() might add a new roc
|
|
|
|
|
|
to existing roc, and tell cfg80211 it has already
|
|
|
|
|
|
started.
|
|
|
|
|
|
|
|
|
|
|
|
However, this might happen before the roc cookie
|
|
|
|
|
|
was set, resulting in REMAIN_ON_CHANNEL (started)
|
|
|
|
|
|
event with null cookie. Consequently, it can make
|
|
|
|
|
|
wpa_supplicant go out of sync.
|
|
|
|
|
|
|
|
|
|
|
|
Fix it by setting the roc cookie earlier.
|
|
|
|
|
|
|
|
|
|
|
|
Cc: stable@vger.kernel.org
|
|
|
|
|
|
Signed-off-by: Eliad Peller <eliad@wizery.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit cfdc9157bfd7bcf88ab4dae08873a9907eba984c
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Fri Jan 24 14:06:29 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
nl80211: send event when AP operation is stopped
|
|
|
|
|
|
|
|
|
|
|
|
There are a few cases, e.g. suspend, where an AP interface is
|
|
|
|
|
|
stopped by the kernel rather than by userspace request, most
|
|
|
|
|
|
commonly when suspending. To let userspace know about this,
|
|
|
|
|
|
send the NL80211_CMD_STOP_AP command as an event every time
|
|
|
|
|
|
an AP interface is stopped. This also happens when userspace
|
|
|
|
|
|
did in fact request the AP stop, but that's not a problem.
|
|
|
|
|
|
|
|
|
|
|
|
For full-MAC drivers this may need to be extended to also
|
|
|
|
|
|
cover cases where the device stopped the AP operation for
|
|
|
|
|
|
some reason, this a bit more complicated because then all
|
|
|
|
|
|
cfg80211 state also needs to be reset; such API is not part
|
|
|
|
|
|
of this patch.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit d5d567eda7704f190379ca852a8f9a4112e3eee3
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Thu Jan 23 16:20:29 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: add length check in ieee80211_is_robust_mgmt_frame()
|
|
|
|
|
|
|
|
|
|
|
|
A few places weren't checking that the frame passed to the
|
|
|
|
|
|
function actually has enough data even though the function
|
|
|
|
|
|
clearly documents it must have a payload byte. Make this
|
|
|
|
|
|
safer by changing the function to take an skb and checking
|
|
|
|
|
|
the length inside. The old version is preserved for now as
|
|
|
|
|
|
the rtl* drivers use it and don't have a correct skb.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit f8f6d212a047fc65c7d3442dfc038f65517236fc
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Fri Jan 24 10:53:53 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
nl80211: fix scheduled scan RSSI matchset attribute confusion
|
|
|
|
|
|
|
|
|
|
|
|
The scheduled scan matchsets were intended to be a list of filters,
|
|
|
|
|
|
with the found BSS having to pass at least one of them to be passed
|
|
|
|
|
|
to the host. When the RSSI attribute was added, however, this was
|
|
|
|
|
|
broken and currently wpa_supplicant adds that attribute in its own
|
|
|
|
|
|
matchset; however, it doesn't intend that to mean that anything
|
|
|
|
|
|
that passes the RSSI filter should be passed to the host, instead
|
|
|
|
|
|
it wants it to mean that everything needs to also have higher RSSI.
|
|
|
|
|
|
|
|
|
|
|
|
This is semantically problematic because we have a list of filters
|
|
|
|
|
|
like [ SSID1, SSID2, SSID3, RSSI ] with no real indication which
|
|
|
|
|
|
one should be OR'ed and which one AND'ed.
|
|
|
|
|
|
|
|
|
|
|
|
To fix this, move the RSSI filter attribute into each matchset. As
|
|
|
|
|
|
we need to stay backward compatible, treat a matchset with only the
|
|
|
|
|
|
RSSI attribute as a "default RSSI filter" for all other matchsets,
|
|
|
|
|
|
but only if there are other matchsets (an RSSI-only matchset by
|
|
|
|
|
|
itself is still desirable.)
|
|
|
|
|
|
|
|
|
|
|
|
To make driver implementation easier, keep a global min_rssi_thold
|
|
|
|
|
|
for the entire request as well. The only affected driver is ath6kl.
|
|
|
|
|
|
|
|
|
|
|
|
I found this when I looked into the code after Raja Mani submitted
|
|
|
|
|
|
a patch fixing the n_match_sets calculation to disregard the RSSI,
|
|
|
|
|
|
but that patch didn't address the semantic issue.
|
|
|
|
|
|
|
|
|
|
|
|
Reported-by: Raja Mani <rmani@qti.qualcomm.com>
|
|
|
|
|
|
Acked-by: Luciano Coelho <luciano.coelho@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit de553e8545e65a6dc4e45f43df7e1443d4291922
|
|
|
|
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
Date: Fri Jan 24 10:17:47 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
nl80211: check nla_parse() return values
|
|
|
|
|
|
|
|
|
|
|
|
If there's a policy, then nla_parse() return values must be
|
|
|
|
|
|
checked, otherwise the policy is useless and there's nothing
|
|
|
|
|
|
that ensures the attributes are actually what we expect them
|
|
|
|
|
|
to be.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
commit 652204a0733e9e1c54661d6f9d36e2e1e3b22bb1
|
|
|
|
|
|
Author: Karl Beldan <karl.beldan@rivierawaves.com>
|
|
|
|
|
|
Date: Thu Jan 23 20:06:34 2014 +0100
|
|
|
|
|
|
|
|
|
|
|
|
mac80211: send {ADD,DEL}BA on AC_VO like other mgmt frames, as per spec
|
|
|
|
|
|
|
|
|
|
|
|
ATM, {ADD,DEL}BA and BAR frames are sent on the AC matching the TID of
|
|
|
|
|
|
the BA parameters. In the discussion [1] about this patch, Johannes
|
|
|
|
|
|
recalled that it fixed some races with the DELBA and indeed this
|
|
|
|
|
|
behavior was introduced in [2].
|
|
|
|
|
|
While [2] is right for the BARs, the part queueing the {ADD,DEL}BAs on
|
|
|
|
|
|
their BA params TID AC violates the spec and is more a workaround for
|
|
|
|
|
|
some drivers. Helmut expressed some concerns wrt such drivers, in
|
|
|
|
|
|
particular DELBAs in rt2x00.
|
|
|
|
|
|
|
|
|
|
|
|
ATM, DELBAs are sent after a driver has called (hence "purposely")
|
|
|
|
|
|
ieee80211_start_tx_ba_cb_irqsafe and Johannes and Emmanuel gave some
|
|
|
|
|
|
details wrt intentions behind the split of the IEEE80211_AMPDU_TX_STOP_*
|
|
|
|
|
|
given to the driver ampdu_action supposed to call this function, which
|
|
|
|
|
|
could prove handy to people trying to do the right thing in faulty
|
|
|
|
|
|
drivers (if their fw/hw don't get in their way).
|
|
|
|
|
|
|
|
|
|
|
|
[1] http://mid.gmane.org/1390391564-18481-1-git-send-email-karl.beldan@gmail.com
|
|
|
|
|
|
[2] Commit: cf6bb79ad828 ("mac80211: Use appropriate TID for sending BAR, ADDBA and DELBA frames")
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
|
|
|
|
|
|
Cc: Helmut Schaa <helmut.schaa@googlemail.com>
|
|
|
|
|
|
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struc
|
|
|
|
|
|
if (nw_type & ADHOC_NETWORK) {
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
|
|
|
|
|
|
nw_type & ADHOC_CREATOR ? "creator" : "joiner");
|
|
|
|
|
|
- cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
|
|
|
|
|
|
cfg80211_put_bss(ar->wiphy, bss);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -861,13 +861,9 @@ void ath6kl_cfg80211_disconnect_event(st
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (vif->nw_type & ADHOC_NETWORK) {
|
|
|
|
|
|
- if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
|
|
|
|
|
|
+ if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
|
|
|
|
|
|
"%s: ath6k not in ibss mode\n", __func__);
|
|
|
|
|
|
- return;
|
|
|
|
|
|
- }
|
|
|
|
|
|
- memset(bssid, 0, ETH_ALEN);
|
|
|
|
|
|
- cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(s
|
2014-01-30 13:21:36 +00:00
|
|
|
|
struct ath6kl_vif *vif = netdev_priv(dev);
|
|
|
|
|
|
u16 interval;
|
|
|
|
|
|
int ret, rssi_thold;
|
|
|
|
|
|
+ int n_match_sets = request->n_match_sets;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ /*
|
|
|
|
|
|
+ * If there's a matchset w/o an SSID, then assume it's just for
|
|
|
|
|
|
+ * the RSSI (nothing else is currently supported) and ignore it.
|
|
|
|
|
|
+ * The device only supports a global RSSI filter that we set below.
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
|
|
|
|
|
|
+ n_match_sets = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (ar->state != ATH6KL_STATE_ON)
|
|
|
|
|
|
return -EIO;
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(s
|
2014-01-30 13:21:36 +00:00
|
|
|
|
ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
|
|
|
|
|
|
request->n_ssids,
|
|
|
|
|
|
request->match_sets,
|
|
|
|
|
|
- request->n_match_sets);
|
|
|
|
|
|
+ n_match_sets);
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
|
|
- if (!request->n_match_sets) {
|
|
|
|
|
|
+ if (!n_match_sets) {
|
|
|
|
|
|
ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
|
|
|
|
|
|
ALL_BSS_FILTER, 0);
|
|
|
|
|
|
if (ret < 0)
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(s
|
2014-01-30 13:21:36 +00:00
|
|
|
|
|
|
|
|
|
|
if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
|
|
|
|
|
|
ar->fw_capabilities)) {
|
|
|
|
|
|
- if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
|
|
|
|
|
|
+ if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
|
|
|
|
|
|
rssi_thold = 0;
|
|
|
|
|
|
- else if (request->rssi_thold < -127)
|
|
|
|
|
|
+ else if (request->min_rssi_thold < -127)
|
|
|
|
|
|
rssi_thold = -127;
|
|
|
|
|
|
else
|
|
|
|
|
|
- rssi_thold = request->rssi_thold;
|
|
|
|
|
|
+ rssi_thold = request->min_rssi_thold;
|
2012-09-08 11:10:54 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
|
|
|
|
|
|
rssi_thold);
|
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
|
@@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct at
|
|
|
|
|
|
if (AR_SREV_9300_20_OR_LATER(ah))
|
|
|
|
|
|
udelay(50);
|
|
|
|
|
|
else if (AR_SREV_9100(ah))
|
|
|
|
|
|
- udelay(10000);
|
|
|
|
|
|
+ mdelay(10);
|
|
|
|
|
|
else
|
|
|
|
|
|
udelay(100);
|
2013-09-08 09:38:32 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -2051,9 +2051,8 @@ static bool ath9k_hw_set_power_awake(str
|
2013-09-08 09:38:32 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
|
|
|
|
|
|
AR_RTC_FORCE_WAKE_EN);
|
|
|
|
|
|
-
|
|
|
|
|
|
if (AR_SREV_9100(ah))
|
|
|
|
|
|
- udelay(10000);
|
|
|
|
|
|
+ mdelay(10);
|
|
|
|
|
|
else
|
|
|
|
|
|
udelay(50);
|
2013-09-08 09:38:32 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
|
@@ -1866,7 +1866,7 @@ static void ath9k_set_coverage_class(str
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
static bool ath9k_has_tx_pending(struct ath_softc *sc)
|
|
|
|
|
|
{
|
|
|
|
|
|
- int i, npend;
|
|
|
|
|
|
+ int i, npend = 0;
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
|
|
|
|
|
|
if (!ATH_TXQ_SETUP(sc, i))
|
|
|
|
|
|
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
|
|
|
|
|
|
@@ -595,6 +595,9 @@ static void iwl_scan_offload_build_ssid(
|
|
|
|
|
|
* config match list.
|
|
|
|
|
|
*/
|
|
|
|
|
|
for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) {
|
|
|
|
|
|
+ /* skip empty SSID matchsets */
|
|
|
|
|
|
+ if (!req->match_sets[i].ssid.ssid_len)
|
|
|
|
|
|
+ continue;
|
|
|
|
|
|
scan->direct_scan[i].id = WLAN_EID_SSID;
|
|
|
|
|
|
scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len;
|
|
|
|
|
|
memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid,
|
|
|
|
|
|
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
|
|
|
|
|
|
@@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80
|
|
|
|
|
|
/* During testing, hdr was NULL */
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
+ if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
(ieee80211_has_protected(hdr->frame_control)))
|
|
|
|
|
|
rx_status->flag &= ~RX_FLAG_DECRYPTED;
|
|
|
|
|
|
else
|
|
|
|
|
|
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
|
|
|
|
|
|
@@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80
|
|
|
|
|
|
/* In testing, hdr was NULL here */
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
+ if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
(ieee80211_has_protected(hdr->frame_control)))
|
|
|
|
|
|
rx_status->flag &= ~RX_FLAG_DECRYPTED;
|
|
|
|
|
|
else
|
|
|
|
|
|
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
|
|
|
|
|
|
@@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80
|
|
|
|
|
|
/* during testing, hdr was NULL here */
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
+ if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
(ieee80211_has_protected(hdr->frame_control)))
|
|
|
|
|
|
rx_status->flag &= ~RX_FLAG_DECRYPTED;
|
|
|
|
|
|
else
|
|
|
|
|
|
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
|
|
|
|
|
|
@@ -334,7 +334,7 @@ bool rtl8723ae_rx_query_desc(struct ieee
|
|
|
|
|
|
/* during testing, hdr could be NULL here */
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
+ if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
|
|
|
|
|
|
(ieee80211_has_protected(hdr->frame_control)))
|
|
|
|
|
|
rx_status->flag &= ~RX_FLAG_DECRYPTED;
|
|
|
|
|
|
else
|
|
|
|
|
|
--- a/include/linux/ieee80211.h
|
|
|
|
|
|
+++ b/include/linux/ieee80211.h
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullf
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
+ * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
|
|
|
|
|
|
+ * @fc: frame control field in little-endian byteorder
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ /* IEEE 802.11-2012, definition of "bufferable management frame";
|
|
|
|
|
|
+ * note that this ignores the IBSS special case. */
|
|
|
|
|
|
+ return ieee80211_is_mgmt(fc) &&
|
|
|
|
|
|
+ (ieee80211_is_action(fc) ||
|
|
|
|
|
|
+ ieee80211_is_disassoc(fc) ||
|
|
|
|
|
|
+ ieee80211_is_deauth(fc));
|
|
|
|
|
|
+}
|
|
|
|
|
|
+
|
|
|
|
|
|
+/**
|
|
|
|
|
|
* ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
|
|
|
|
|
|
* @seq_ctrl: frame sequence control bytes in little-endian byteorder
|
|
|
|
|
|
*/
|
|
|
|
|
|
@@ -2192,10 +2206,10 @@ static inline u8 *ieee80211_get_DA(struc
|
2014-01-30 13:21:36 +00:00
|
|
|
|
}
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/**
|
|
|
|
|
|
- * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
|
|
|
|
|
|
+ * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
|
|
|
|
|
|
* @hdr: the frame (buffer must include at least the first octet of payload)
|
|
|
|
|
|
*/
|
|
|
|
|
|
-static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
|
|
|
|
|
|
+static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (ieee80211_is_disassoc(hdr->frame_control) ||
|
|
|
|
|
|
ieee80211_is_deauth(hdr->frame_control))
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -2224,6 +2238,17 @@ static inline bool ieee80211_is_robust_m
|
2014-01-30 13:21:36 +00:00
|
|
|
|
}
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/**
|
|
|
|
|
|
+ * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
|
|
|
|
|
|
+ * @skb: the skb containing the frame, length will be checked
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ if (skb->len < 25)
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
+ return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
|
|
|
|
|
|
+}
|
2013-11-12 22:11:33 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+/**
|
|
|
|
|
|
* ieee80211_is_public_action - check if frame is a public action frame
|
|
|
|
|
|
* @hdr: the frame
|
|
|
|
|
|
* @len: length of the frame
|
|
|
|
|
|
--- a/include/net/cfg80211.h
|
|
|
|
|
|
+++ b/include/net/cfg80211.h
|
|
|
|
|
|
@@ -1395,9 +1395,11 @@ struct cfg80211_scan_request {
|
|
|
|
|
|
* struct cfg80211_match_set - sets of attributes to match
|
|
|
|
|
|
*
|
|
|
|
|
|
* @ssid: SSID to be matched
|
|
|
|
|
|
+ * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
|
|
|
|
|
|
*/
|
|
|
|
|
|
struct cfg80211_match_set {
|
|
|
|
|
|
struct cfg80211_ssid ssid;
|
|
|
|
|
|
+ s32 rssi_thold;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
@@ -1420,7 +1422,8 @@ struct cfg80211_match_set {
|
|
|
|
|
|
* @dev: the interface
|
|
|
|
|
|
* @scan_start: start time of the scheduled scan
|
|
|
|
|
|
* @channels: channels to scan
|
|
|
|
|
|
- * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
|
|
|
|
|
|
+ * @min_rssi_thold: for drivers only supporting a single threshold, this
|
|
|
|
|
|
+ * contains the minimum over all matchsets
|
|
|
|
|
|
*/
|
|
|
|
|
|
struct cfg80211_sched_scan_request {
|
|
|
|
|
|
struct cfg80211_ssid *ssids;
|
|
|
|
|
|
@@ -1433,7 +1436,7 @@ struct cfg80211_sched_scan_request {
|
|
|
|
|
|
u32 flags;
|
|
|
|
|
|
struct cfg80211_match_set *match_sets;
|
|
|
|
|
|
int n_match_sets;
|
|
|
|
|
|
- s32 rssi_thold;
|
|
|
|
|
|
+ s32 min_rssi_thold;
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/* internal */
|
|
|
|
|
|
struct wiphy *wiphy;
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -3130,8 +3133,8 @@ struct cfg80211_cached_keys;
|
|
|
|
|
|
* @identifier: (private) Identifier used in nl80211 to identify this
|
|
|
|
|
|
* wireless device if it has no netdev
|
|
|
|
|
|
* @current_bss: (private) Used by the internal configuration code
|
|
|
|
|
|
- * @channel: (private) Used by the internal configuration code to track
|
|
|
|
|
|
- * the user-set AP, monitor and WDS channel
|
|
|
|
|
|
+ * @chandef: (private) Used by the internal configuration code to track
|
|
|
|
|
|
+ * the user-set channel definition.
|
|
|
|
|
|
* @preset_chandef: (private) Used by the internal configuration code to
|
|
|
|
|
|
* track the channel to be used for AP later
|
|
|
|
|
|
* @bssid: (private) Used by the internal configuration code
|
|
|
|
|
|
@@ -3195,9 +3198,7 @@ struct wireless_dev {
|
|
|
|
|
|
|
|
|
|
|
|
struct cfg80211_internal_bss *current_bss; /* associated / joined */
|
|
|
|
|
|
struct cfg80211_chan_def preset_chandef;
|
|
|
|
|
|
-
|
|
|
|
|
|
- /* for AP and mesh channel tracking */
|
|
|
|
|
|
- struct ieee80211_channel *channel;
|
|
|
|
|
|
+ struct cfg80211_chan_def chandef;
|
|
|
|
|
|
|
|
|
|
|
|
bool ibss_fixed;
|
|
|
|
|
|
bool ibss_dfs_possible;
|
|
|
|
|
|
@@ -3879,6 +3880,7 @@ void cfg80211_michael_mic_failure(struct
|
|
|
|
|
|
*
|
|
|
|
|
|
* @dev: network device
|
|
|
|
|
|
* @bssid: the BSSID of the IBSS joined
|
|
|
|
|
|
+ * @channel: the channel of the IBSS joined
|
|
|
|
|
|
* @gfp: allocation flags
|
|
|
|
|
|
*
|
|
|
|
|
|
* This function notifies cfg80211 that the device joined an IBSS or
|
|
|
|
|
|
@@ -3888,7 +3890,8 @@ void cfg80211_michael_mic_failure(struct
|
|
|
|
|
|
* with the locally generated beacon -- this guarantees that there is
|
|
|
|
|
|
* always a scan result for this IBSS. cfg80211 will handle the rest.
|
|
|
|
|
|
*/
|
|
|
|
|
|
-void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp);
|
|
|
|
|
|
+void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
|
|
|
|
|
|
+ struct ieee80211_channel *channel, gfp_t gfp);
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/include/uapi/linux/nl80211.h
|
|
|
|
|
|
+++ b/include/uapi/linux/nl80211.h
|
|
|
|
|
|
@@ -2442,9 +2442,15 @@ enum nl80211_reg_rule_attr {
|
|
|
|
|
|
* enum nl80211_sched_scan_match_attr - scheduled scan match attributes
|
|
|
|
|
|
* @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
|
|
|
|
|
|
* @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
|
|
|
|
|
|
- * only report BSS with matching SSID.
|
|
|
|
|
|
+ * only report BSS with matching SSID.
|
|
|
|
|
|
* @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
|
|
|
|
|
|
- * BSS in scan results. Filtering is turned off if not specified.
|
|
|
|
|
|
+ * BSS in scan results. Filtering is turned off if not specified. Note that
|
|
|
|
|
|
+ * if this attribute is in a match set of its own, then it is treated as
|
|
|
|
|
|
+ * the default value for all matchsets with an SSID, rather than being a
|
|
|
|
|
|
+ * matchset of its own without an RSSI filter. This is due to problems with
|
|
|
|
|
|
+ * how this API was implemented in the past. Also, due to the same problem,
|
|
|
|
|
|
+ * the only way to create a matchset with only an RSSI filter (with this
|
|
|
|
|
|
+ * attribute) is if there's only a single matchset with the RSSI attribute.
|
|
|
|
|
|
* @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
|
|
|
|
|
|
* attribute number currently defined
|
|
|
|
|
|
* @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
|
|
|
|
|
|
--- a/net/mac80211/agg-tx.c
|
|
|
|
|
|
+++ b/net/mac80211/agg-tx.c
|
|
|
|
|
|
@@ -107,7 +107,7 @@ static void ieee80211_send_addba_request
|
|
|
|
|
|
mgmt->u.action.u.addba_req.start_seq_num =
|
|
|
|
|
|
cpu_to_le16(start_seq_num << 4);
|
|
|
|
|
|
|
|
|
|
|
|
- ieee80211_tx_skb_tid(sdata, skb, tid);
|
|
|
|
|
|
+ ieee80211_tx_skb(sdata, skb);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn)
|
|
|
|
|
|
--- a/net/mac80211/cfg.c
|
|
|
|
|
|
+++ b/net/mac80211/cfg.c
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wip
|
|
|
|
|
|
/* TODO: make hostapd tell us what it wants */
|
|
|
|
|
|
sdata->smps_mode = IEEE80211_SMPS_OFF;
|
|
|
|
|
|
sdata->needed_rx_chains = sdata->local->rx_chains;
|
|
|
|
|
|
- sdata->radar_required = params->radar_required;
|
|
|
|
|
|
|
|
|
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
|
|
+ sdata->radar_required = params->radar_required;
|
|
|
|
|
|
err = ieee80211_vif_use_channel(sdata, ¶ms->chandef,
|
|
|
|
|
|
IEEE80211_CHANCTX_SHARED);
|
|
|
|
|
|
mutex_unlock(&local->mtx);
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -1021,8 +1021,10 @@ static int ieee80211_start_ap(struct wip
|
|
|
|
|
|
IEEE80211_P2P_OPPPS_ENABLE_BIT;
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
err = ieee80211_assign_beacon(sdata, ¶ms->beacon);
|
|
|
|
|
|
- if (err < 0)
|
|
|
|
|
|
+ if (err < 0) {
|
|
|
|
|
|
+ ieee80211_vif_release_channel(sdata);
|
|
|
|
|
|
return err;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
changed |= err;
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
err = drv_start_ap(sdata->local, sdata);
|
|
|
|
|
|
@@ -1032,6 +1034,7 @@ static int ieee80211_start_ap(struct wip
|
|
|
|
|
|
if (old)
|
|
|
|
|
|
kfree_rcu(old, rcu_head);
|
|
|
|
|
|
RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
|
|
|
|
|
|
+ ieee80211_vif_release_channel(sdata);
|
|
|
|
|
|
return err;
|
|
|
|
|
|
}
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -1053,6 +1056,7 @@ static int ieee80211_change_beacon(struc
|
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
|
|
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
|
|
|
|
|
|
/* don't allow changing the beacon while CSA is in place - offset
|
|
|
|
|
|
* of channel switch counter may change
|
|
|
|
|
|
@@ -1080,6 +1084,8 @@ static int ieee80211_stop_ap(struct wiph
|
|
|
|
|
|
struct probe_resp *old_probe_resp;
|
|
|
|
|
|
struct cfg80211_chan_def chandef;
|
|
|
|
|
|
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
+
|
|
|
|
|
|
old_beacon = sdata_dereference(sdata->u.ap.beacon, sdata);
|
|
|
|
|
|
if (!old_beacon)
|
|
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
@@ -1090,8 +1096,6 @@ static int ieee80211_stop_ap(struct wiph
|
2014-01-30 13:21:36 +00:00
|
|
|
|
kfree(sdata->u.ap.next_beacon);
|
|
|
|
|
|
sdata->u.ap.next_beacon = NULL;
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- cancel_work_sync(&sdata->u.ap.request_smps_work);
|
2013-11-27 10:56:05 +00:00
|
|
|
|
-
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/* turn off carrier for this interface and dependent VLANs */
|
|
|
|
|
|
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
|
|
|
|
|
|
netif_carrier_off(vlan->dev);
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -1103,6 +1107,7 @@ static int ieee80211_stop_ap(struct wiph
|
2014-01-30 13:21:36 +00:00
|
|
|
|
kfree_rcu(old_beacon, rcu_head);
|
|
|
|
|
|
if (old_probe_resp)
|
|
|
|
|
|
kfree_rcu(old_probe_resp, rcu_head);
|
|
|
|
|
|
+ sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
|
|
|
|
|
|
|
|
|
|
|
|
__sta_info_flush(sdata, true);
|
|
|
|
|
|
ieee80211_free_keys(sdata, true);
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -2638,6 +2643,24 @@ static int ieee80211_start_roc_work(stru
|
2014-01-30 13:21:36 +00:00
|
|
|
|
INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
|
|
|
|
|
|
INIT_LIST_HEAD(&roc->dependents);
|
|
|
|
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
|
+ * cookie is either the roc cookie (for normal roc)
|
|
|
|
|
|
+ * or the SKB (for mgmt TX)
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ if (!txskb) {
|
|
|
|
|
|
+ /* local->mtx protects this */
|
|
|
|
|
|
+ local->roc_cookie_counter++;
|
|
|
|
|
|
+ roc->cookie = local->roc_cookie_counter;
|
|
|
|
|
|
+ /* wow, you wrapped 64 bits ... more likely a bug */
|
|
|
|
|
|
+ if (WARN_ON(roc->cookie == 0)) {
|
|
|
|
|
|
+ roc->cookie = 1;
|
|
|
|
|
|
+ local->roc_cookie_counter++;
|
2013-11-27 10:56:05 +00:00
|
|
|
|
+ }
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ *cookie = roc->cookie;
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+ *cookie = (unsigned long)txskb;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
/* if there's one pending or we're scanning, queue this one */
|
|
|
|
|
|
if (!list_empty(&local->roc_list) ||
|
|
|
|
|
|
local->scanning || local->radar_detect_enabled)
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -2772,24 +2795,6 @@ static int ieee80211_start_roc_work(stru
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (!queued)
|
|
|
|
|
|
list_add_tail(&roc->list, &local->roc_list);
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- /*
|
|
|
|
|
|
- * cookie is either the roc cookie (for normal roc)
|
|
|
|
|
|
- * or the SKB (for mgmt TX)
|
|
|
|
|
|
- */
|
|
|
|
|
|
- if (!txskb) {
|
|
|
|
|
|
- /* local->mtx protects this */
|
|
|
|
|
|
- local->roc_cookie_counter++;
|
|
|
|
|
|
- roc->cookie = local->roc_cookie_counter;
|
|
|
|
|
|
- /* wow, you wrapped 64 bits ... more likely a bug */
|
|
|
|
|
|
- if (WARN_ON(roc->cookie == 0)) {
|
|
|
|
|
|
- roc->cookie = 1;
|
|
|
|
|
|
- local->roc_cookie_counter++;
|
|
|
|
|
|
- }
|
|
|
|
|
|
- *cookie = roc->cookie;
|
|
|
|
|
|
- } else {
|
|
|
|
|
|
- *cookie = (unsigned long)txskb;
|
|
|
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -3004,8 +3009,10 @@ void ieee80211_csa_finalize_work(struct
|
|
|
|
|
|
if (!ieee80211_sdata_running(sdata))
|
|
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
|
|
|
|
- sdata->radar_required = sdata->csa_radar_required;
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
+
|
|
|
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
|
|
+ sdata->radar_required = sdata->csa_radar_required;
|
|
|
|
|
|
err = ieee80211_vif_change_channel(sdata, &changed);
|
|
|
|
|
|
mutex_unlock(&local->mtx);
|
|
|
|
|
|
if (WARN_ON(err < 0))
|
|
|
|
|
|
@@ -3022,13 +3029,13 @@ void ieee80211_csa_finalize_work(struct
|
|
|
|
|
|
switch (sdata->vif.type) {
|
|
|
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
|
|
err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
|
|
|
|
|
|
+ kfree(sdata->u.ap.next_beacon);
|
|
|
|
|
|
+ sdata->u.ap.next_beacon = NULL;
|
|
|
|
|
|
+
|
|
|
|
|
|
if (err < 0)
|
|
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
|
|
|
|
changed |= err;
|
|
|
|
|
|
- kfree(sdata->u.ap.next_beacon);
|
|
|
|
|
|
- sdata->u.ap.next_beacon = NULL;
|
|
|
|
|
|
-
|
|
|
|
|
|
ieee80211_bss_info_change_notify(sdata, err);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
|
|
@@ -3066,7 +3073,7 @@ int ieee80211_channel_switch(struct wiph
|
|
|
|
|
|
struct ieee80211_if_mesh __maybe_unused *ifmsh;
|
|
|
|
|
|
int err, num_chanctx;
|
|
|
|
|
|
|
|
|
|
|
|
- lockdep_assert_held(&sdata->wdev.mtx);
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
|
|
|
|
|
|
if (!list_empty(&local->roc_list) || local->scanning)
|
|
|
|
|
|
return -EBUSY;
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/mac80211/ht.c
|
|
|
|
|
|
+++ b/net/mac80211/ht.c
|
|
|
|
|
|
@@ -375,7 +375,7 @@ void ieee80211_send_delba(struct ieee802
|
|
|
|
|
|
mgmt->u.action.u.delba.params = cpu_to_le16(params);
|
|
|
|
|
|
mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- ieee80211_tx_skb_tid(sdata, skb, tid);
|
|
|
|
|
|
+ ieee80211_tx_skb(sdata, skb);
|
|
|
|
|
|
}
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
|
|
|
|
|
|
@@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(stru
|
|
|
|
|
|
u.ap.request_smps_work);
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
sdata_lock(sdata);
|
|
|
|
|
|
- __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode);
|
|
|
|
|
|
+ if (sdata_dereference(sdata->u.ap.beacon, sdata))
|
|
|
|
|
|
+ __ieee80211_request_smps_ap(sdata,
|
|
|
|
|
|
+ sdata->u.ap.driver_smps_mode);
|
|
|
|
|
|
sdata_unlock(sdata);
|
|
|
|
|
|
}
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/mac80211/iface.c
|
|
|
|
|
|
+++ b/net/mac80211/iface.c
|
|
|
|
|
|
@@ -770,12 +770,19 @@ static void ieee80211_do_stop(struct iee
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
ieee80211_roc_purge(local, sdata);
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (sdata->vif.type == NL80211_IFTYPE_STATION)
|
|
|
|
|
|
+ switch (sdata->vif.type) {
|
|
|
|
|
|
+ case NL80211_IFTYPE_STATION:
|
|
|
|
|
|
ieee80211_mgd_stop(sdata);
|
|
|
|
|
|
-
|
|
|
|
|
|
- if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
|
|
|
|
|
|
+ break;
|
|
|
|
|
|
+ case NL80211_IFTYPE_ADHOC:
|
|
|
|
|
|
ieee80211_ibss_stop(sdata);
|
|
|
|
|
|
-
|
|
|
|
|
|
+ break;
|
|
|
|
|
|
+ case NL80211_IFTYPE_AP:
|
|
|
|
|
|
+ cancel_work_sync(&sdata->u.ap.request_smps_work);
|
|
|
|
|
|
+ break;
|
|
|
|
|
|
+ default:
|
|
|
|
|
|
+ break;
|
2013-12-08 14:48:30 +00:00
|
|
|
|
+ }
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/*
|
|
|
|
|
|
* Remove all stations associated with this interface.
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -827,7 +834,9 @@ static void ieee80211_do_stop(struct iee
|
|
|
|
|
|
cancel_work_sync(&local->dynamic_ps_enable_work);
|
|
|
|
|
|
|
|
|
|
|
|
cancel_work_sync(&sdata->recalc_smps);
|
|
|
|
|
|
+ sdata_lock(sdata);
|
|
|
|
|
|
sdata->vif.csa_active = false;
|
|
|
|
|
|
+ sdata_unlock(sdata);
|
|
|
|
|
|
cancel_work_sync(&sdata->csa_finalize_work);
|
|
|
|
|
|
|
|
|
|
|
|
cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/mac80211/rx.c
|
|
|
|
|
|
+++ b/net/mac80211/rx.c
|
|
|
|
|
|
@@ -599,10 +599,10 @@ static int ieee80211_is_unicast_robust_m
|
|
|
|
|
|
{
|
|
|
|
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
|
2011-05-31 23:07:29 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (skb->len < 24 || is_multicast_ether_addr(hdr->addr1))
|
|
|
|
|
|
+ if (is_multicast_ether_addr(hdr->addr1))
|
|
|
|
|
|
return 0;
|
2013-09-08 09:38:32 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- return ieee80211_is_robust_mgmt_frame(hdr);
|
|
|
|
|
|
+ return ieee80211_is_robust_mgmt_frame(skb);
|
|
|
|
|
|
}
|
2013-09-08 09:38:32 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
|
|
|
|
|
|
@@ -610,10 +610,10 @@ static int ieee80211_is_multicast_robust
|
2013-11-12 22:11:33 +00:00
|
|
|
|
{
|
2014-01-30 13:21:36 +00:00
|
|
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
|
|
|
|
|
|
|
|
- if (skb->len < 24 || !is_multicast_ether_addr(hdr->addr1))
|
|
|
|
|
|
+ if (!is_multicast_ether_addr(hdr->addr1))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
- return ieee80211_is_robust_mgmt_frame(hdr);
|
|
|
|
|
|
+ return ieee80211_is_robust_mgmt_frame(skb);
|
2013-06-30 10:44:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2013-07-12 07:59:59 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -626,7 +626,7 @@ static int ieee80211_get_mmie_keyidx(str
|
|
|
|
|
|
if (skb->len < 24 + sizeof(*mmie) || !is_multicast_ether_addr(hdr->da))
|
|
|
|
|
|
return -1;
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *) hdr))
|
|
|
|
|
|
+ if (!ieee80211_is_robust_mgmt_frame(skb))
|
|
|
|
|
|
return -1; /* not a robust management frame */
|
2013-11-12 22:11:33 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
mmie = (struct ieee80211_mmie *)
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -1311,18 +1311,15 @@ ieee80211_rx_h_sta_process(struct ieee80
|
|
|
|
|
|
!ieee80211_has_morefrags(hdr->frame_control) &&
|
|
|
|
|
|
!(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
|
|
|
|
|
|
(rx->sdata->vif.type == NL80211_IFTYPE_AP ||
|
|
|
|
|
|
- rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
|
|
|
|
|
|
+ rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
|
|
|
|
|
|
+ /* PM bit is only checked in frames where it isn't reserved,
|
|
|
|
|
|
+ * in AP mode it's reserved in non-bufferable management frames
|
|
|
|
|
|
+ * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ (!ieee80211_is_mgmt(hdr->frame_control) ||
|
|
|
|
|
|
+ ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
|
|
|
|
|
|
if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
|
|
|
|
|
|
- /*
|
|
|
|
|
|
- * Ignore doze->wake transitions that are
|
|
|
|
|
|
- * indicated by non-data frames, the standard
|
|
|
|
|
|
- * is unclear here, but for example going to
|
|
|
|
|
|
- * PS mode and then scanning would cause a
|
|
|
|
|
|
- * doze->wake transition for the probe request,
|
|
|
|
|
|
- * and that is clearly undesirable.
|
|
|
|
|
|
- */
|
|
|
|
|
|
- if (ieee80211_is_data(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_has_pm(hdr->frame_control))
|
|
|
|
|
|
+ if (!ieee80211_has_pm(hdr->frame_control))
|
|
|
|
|
|
sta_ps_end(sta);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
if (ieee80211_has_pm(hdr->frame_control))
|
|
|
|
|
|
@@ -1845,8 +1842,7 @@ static int ieee80211_drop_unencrypted_mg
|
2014-01-30 13:21:36 +00:00
|
|
|
|
* having configured keys.
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (unlikely(ieee80211_is_action(fc) && !rx->key &&
|
|
|
|
|
|
- ieee80211_is_robust_mgmt_frame(
|
|
|
|
|
|
- (struct ieee80211_hdr *) rx->skb->data)))
|
|
|
|
|
|
+ ieee80211_is_robust_mgmt_frame(rx->skb)))
|
|
|
|
|
|
return -EACCES;
|
|
|
|
|
|
}
|
2013-11-27 10:56:05 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/mac80211/tx.c
|
|
|
|
|
|
+++ b/net/mac80211/tx.c
|
|
|
|
|
|
@@ -452,8 +452,7 @@ static int ieee80211_use_mfp(__le16 fc,
|
|
|
|
|
|
if (sta == NULL || !test_sta_flag(sta, WLAN_STA_MFP))
|
|
|
|
|
|
return 0;
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (!ieee80211_is_robust_mgmt_frame((struct ieee80211_hdr *)
|
|
|
|
|
|
- skb->data))
|
|
|
|
|
|
+ if (!ieee80211_is_robust_mgmt_frame(skb))
|
|
|
|
|
|
return 0;
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
return 1;
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -525,9 +524,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
|
|
|
|
|
|
|
|
|
|
|
|
/* only deauth, disassoc and action are bufferable MMPDUs */
|
|
|
|
|
|
if (ieee80211_is_mgmt(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_is_deauth(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_is_disassoc(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_is_action(hdr->frame_control)) {
|
|
|
|
|
|
+ !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
|
|
|
|
|
|
if (tx->flags & IEEE80211_TX_UNICAST)
|
|
|
|
|
|
info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
|
|
|
|
|
|
return TX_CONTINUE;
|
|
|
|
|
|
@@ -567,7 +564,7 @@ ieee80211_tx_h_select_key(struct ieee802
|
2014-01-30 13:21:36 +00:00
|
|
|
|
tx->key = key;
|
|
|
|
|
|
else if (ieee80211_is_mgmt(hdr->frame_control) &&
|
|
|
|
|
|
is_multicast_ether_addr(hdr->addr1) &&
|
|
|
|
|
|
- ieee80211_is_robust_mgmt_frame(hdr) &&
|
|
|
|
|
|
+ ieee80211_is_robust_mgmt_frame(tx->skb) &&
|
|
|
|
|
|
(key = rcu_dereference(tx->sdata->default_mgmt_key)))
|
|
|
|
|
|
tx->key = key;
|
|
|
|
|
|
else if (is_multicast_ether_addr(hdr->addr1) &&
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -582,12 +579,12 @@ ieee80211_tx_h_select_key(struct ieee802
|
2014-01-30 13:21:36 +00:00
|
|
|
|
tx->key = NULL;
|
|
|
|
|
|
else if (tx->skb->protocol == tx->sdata->control_port_protocol)
|
|
|
|
|
|
tx->key = NULL;
|
|
|
|
|
|
- else if (ieee80211_is_robust_mgmt_frame(hdr) &&
|
|
|
|
|
|
+ else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
|
|
|
|
|
|
!(ieee80211_is_action(hdr->frame_control) &&
|
|
|
|
|
|
tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
|
|
|
|
|
|
tx->key = NULL;
|
|
|
|
|
|
else if (ieee80211_is_mgmt(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_is_robust_mgmt_frame(hdr))
|
|
|
|
|
|
+ !ieee80211_is_robust_mgmt_frame(tx->skb))
|
|
|
|
|
|
tx->key = NULL;
|
|
|
|
|
|
else {
|
|
|
|
|
|
I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -878,7 +875,7 @@ static int ieee80211_fragment(struct iee
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* adjust first fragment's length */
|
|
|
|
|
|
- skb->len = hdrlen + per_fragm;
|
|
|
|
|
|
+ skb_trim(skb, hdrlen + per_fragm);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/mac80211/wpa.c
|
|
|
|
|
|
+++ b/net/mac80211/wpa.c
|
|
|
|
|
|
@@ -499,7 +499,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
|
|
|
|
|
|
hdrlen = ieee80211_hdrlen(hdr->frame_control);
|
|
|
|
|
|
|
|
|
|
|
|
if (!ieee80211_is_data(hdr->frame_control) &&
|
|
|
|
|
|
- !ieee80211_is_robust_mgmt_frame(hdr))
|
|
|
|
|
|
+ !ieee80211_is_robust_mgmt_frame(skb))
|
|
|
|
|
|
return RX_CONTINUE;
|
|
|
|
|
|
|
|
|
|
|
|
data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN -
|
|
|
|
|
|
--- a/net/wireless/ap.c
|
|
|
|
|
|
+++ b/net/wireless/ap.c
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -27,9 +27,10 @@ static int __cfg80211_stop_ap(struct cfg
|
|
|
|
|
|
err = rdev_stop_ap(rdev, dev);
|
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
wdev->beacon_interval = 0;
|
|
|
|
|
|
- wdev->channel = NULL;
|
|
|
|
|
|
+ memset(&wdev->chandef, 0, sizeof(wdev->chandef));
|
2014-01-30 13:21:36 +00:00
|
|
|
|
wdev->ssid_len = 0;
|
|
|
|
|
|
rdev_set_qos_map(rdev, dev, NULL);
|
|
|
|
|
|
+ nl80211_send_ap_stopped(wdev);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
|
--- a/net/wireless/core.c
|
|
|
|
|
|
+++ b/net/wireless/core.c
|
|
|
|
|
|
@@ -203,8 +203,11 @@ void cfg80211_stop_p2p_device(struct cfg
|
|
|
|
|
|
|
|
|
|
|
|
rdev->opencount--;
|
|
|
|
|
|
|
|
|
|
|
|
- WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
|
|
|
|
|
|
- !rdev->scan_req->notified);
|
|
|
|
|
|
+ if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
|
|
|
|
|
|
+ if (WARN_ON(!rdev->scan_req->notified))
|
|
|
|
|
|
+ rdev->scan_req->aborted = true;
|
|
|
|
|
|
+ ___cfg80211_scan_done(rdev, false);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
static int cfg80211_rfkill_set_block(void *data, bool blocked)
|
|
|
|
|
|
@@ -447,9 +450,6 @@ int wiphy_register(struct wiphy *wiphy)
|
|
|
|
|
|
int i;
|
|
|
|
|
|
u16 ifmodes = wiphy->interface_modes;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
|
|
|
|
|
|
- wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
-
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/*
|
|
|
|
|
|
* There are major locking problems in nl80211/mac80211 for CSA,
|
|
|
|
|
|
* disable for all drivers until this has been reworked.
|
|
|
|
|
|
@@ -875,8 +875,11 @@ static int cfg80211_netdev_notifier_call
|
|
|
|
|
|
break;
|
|
|
|
|
|
case NETDEV_DOWN:
|
|
|
|
|
|
cfg80211_update_iface_num(rdev, wdev->iftype, -1);
|
|
|
|
|
|
- WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
|
|
|
|
|
|
- !rdev->scan_req->notified);
|
|
|
|
|
|
+ if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
|
|
|
|
|
|
+ if (WARN_ON(!rdev->scan_req->notified))
|
|
|
|
|
|
+ rdev->scan_req->aborted = true;
|
|
|
|
|
|
+ ___cfg80211_scan_done(rdev, false);
|
|
|
|
|
|
+ }
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (WARN_ON(rdev->sched_scan_req &&
|
|
|
|
|
|
rdev->sched_scan_req->dev == wdev->netdev)) {
|
|
|
|
|
|
--- a/net/wireless/core.h
|
|
|
|
|
|
+++ b/net/wireless/core.h
|
|
|
|
|
|
@@ -62,6 +62,7 @@ struct cfg80211_registered_device {
|
|
|
|
|
|
struct rb_root bss_tree;
|
|
|
|
|
|
u32 bss_generation;
|
|
|
|
|
|
struct cfg80211_scan_request *scan_req; /* protected by RTNL */
|
|
|
|
|
|
+ struct sk_buff *scan_msg;
|
|
|
|
|
|
struct cfg80211_sched_scan_request *sched_scan_req;
|
|
|
|
|
|
unsigned long suspend_at;
|
|
|
|
|
|
struct work_struct scan_done_wk;
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -210,6 +211,7 @@ struct cfg80211_event {
|
|
|
|
|
|
} dc;
|
|
|
|
|
|
struct {
|
|
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
|
|
+ struct ieee80211_channel *channel;
|
|
|
|
|
|
} ij;
|
|
|
|
|
|
};
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -257,7 +259,8 @@ int __cfg80211_leave_ibss(struct cfg8021
|
|
|
|
|
|
struct net_device *dev, bool nowext);
|
|
|
|
|
|
int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
struct net_device *dev, bool nowext);
|
|
|
|
|
|
-void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);
|
|
|
|
|
|
+void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
|
|
|
|
|
|
+ struct ieee80211_channel *channel);
|
|
|
|
|
|
int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
struct wireless_dev *wdev);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -361,7 +364,8 @@ int cfg80211_validate_key_settings(struc
|
2014-01-30 13:21:36 +00:00
|
|
|
|
struct key_params *params, int key_idx,
|
|
|
|
|
|
bool pairwise, const u8 *mac_addr);
|
|
|
|
|
|
void __cfg80211_scan_done(struct work_struct *wk);
|
|
|
|
|
|
-void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);
|
|
|
|
|
|
+void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ bool send_message);
|
|
|
|
|
|
void __cfg80211_sched_scan_results(struct work_struct *wk);
|
|
|
|
|
|
int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
bool driver_initiated);
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -441,7 +445,8 @@ static inline unsigned int elapsed_jiffi
|
|
|
|
|
|
void
|
|
|
|
|
|
cfg80211_get_chan_state(struct wireless_dev *wdev,
|
|
|
|
|
|
struct ieee80211_channel **chan,
|
|
|
|
|
|
- enum cfg80211_chan_mode *chanmode);
|
|
|
|
|
|
+ enum cfg80211_chan_mode *chanmode,
|
|
|
|
|
|
+ u8 *radar_detect);
|
|
|
|
|
|
|
|
|
|
|
|
int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
struct cfg80211_chan_def *chandef);
|
2014-01-30 13:21:36 +00:00
|
|
|
|
--- a/net/wireless/nl80211.c
|
|
|
|
|
|
+++ b/net/wireless/nl80211.c
|
|
|
|
|
|
@@ -1723,9 +1723,10 @@ static int nl80211_dump_wiphy(struct sk_
|
|
|
|
|
|
* We can then retry with the larger buffer.
|
|
|
|
|
|
*/
|
|
|
|
|
|
if ((ret == -ENOBUFS || ret == -EMSGSIZE) &&
|
|
|
|
|
|
- !skb->len &&
|
|
|
|
|
|
+ !skb->len && !state->split &&
|
|
|
|
|
|
cb->min_dump_alloc < 4096) {
|
|
|
|
|
|
cb->min_dump_alloc = 4096;
|
|
|
|
|
|
+ state->split_start = 0;
|
|
|
|
|
|
rtnl_unlock();
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -2047,10 +2048,12 @@ static int nl80211_set_wiphy(struct sk_b
|
|
|
|
|
|
nla_for_each_nested(nl_txq_params,
|
|
|
|
|
|
info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
|
|
|
|
|
|
rem_txq_params) {
|
|
|
|
|
|
- nla_parse(tb, NL80211_TXQ_ATTR_MAX,
|
|
|
|
|
|
- nla_data(nl_txq_params),
|
|
|
|
|
|
- nla_len(nl_txq_params),
|
|
|
|
|
|
- txq_params_policy);
|
|
|
|
|
|
+ result = nla_parse(tb, NL80211_TXQ_ATTR_MAX,
|
|
|
|
|
|
+ nla_data(nl_txq_params),
|
|
|
|
|
|
+ nla_len(nl_txq_params),
|
|
|
|
|
|
+ txq_params_policy);
|
|
|
|
|
|
+ if (result)
|
|
|
|
|
|
+ goto bad_res;
|
|
|
|
|
|
result = parse_txq_params(tb, &txq_params);
|
|
|
|
|
|
if (result)
|
|
|
|
|
|
goto bad_res;
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -3289,7 +3292,7 @@ static int nl80211_start_ap(struct sk_bu
|
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
wdev->preset_chandef = params.chandef;
|
|
|
|
|
|
wdev->beacon_interval = params.beacon_interval;
|
|
|
|
|
|
- wdev->channel = params.chandef.chan;
|
|
|
|
|
|
+ wdev->chandef = params.chandef;
|
|
|
|
|
|
wdev->ssid_len = params.ssid_len;
|
|
|
|
|
|
memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
|
|
|
|
|
|
}
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -5210,9 +5213,11 @@ static int nl80211_set_reg(struct sk_buf
|
|
|
|
|
|
|
|
|
|
|
|
nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
|
|
|
|
|
|
rem_reg_rules) {
|
|
|
|
|
|
- nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
|
|
|
|
|
|
- nla_data(nl_reg_rule), nla_len(nl_reg_rule),
|
|
|
|
|
|
- reg_rule_policy);
|
|
|
|
|
|
+ r = nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
|
|
|
|
|
|
+ nla_data(nl_reg_rule), nla_len(nl_reg_rule),
|
|
|
|
|
|
+ reg_rule_policy);
|
|
|
|
|
|
+ if (r)
|
|
|
|
|
|
+ goto bad_reg;
|
|
|
|
|
|
r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
|
|
|
|
|
|
if (r)
|
|
|
|
|
|
goto bad_reg;
|
|
|
|
|
|
@@ -5277,7 +5282,7 @@ static int nl80211_trigger_scan(struct s
|
|
|
|
|
|
if (!rdev->ops->scan)
|
|
|
|
|
|
return -EOPNOTSUPP;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (rdev->scan_req) {
|
|
|
|
|
|
+ if (rdev->scan_req || rdev->scan_msg) {
|
|
|
|
|
|
err = -EBUSY;
|
|
|
|
|
|
goto unlock;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -5475,6 +5480,7 @@ static int nl80211_start_sched_scan(stru
|
|
|
|
|
|
enum ieee80211_band band;
|
|
|
|
|
|
size_t ie_len;
|
|
|
|
|
|
struct nlattr *tb[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1];
|
|
|
|
|
|
+ s32 default_match_rssi = NL80211_SCAN_RSSI_THOLD_OFF;
|
|
|
|
|
|
|
|
|
|
|
|
if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN) ||
|
|
|
|
|
|
!rdev->ops->sched_scan_start)
|
|
|
|
|
|
@@ -5509,11 +5515,40 @@ static int nl80211_start_sched_scan(stru
|
|
|
|
|
|
if (n_ssids > wiphy->max_sched_scan_ssids)
|
|
|
|
|
|
return -EINVAL;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH])
|
|
|
|
|
|
+ /*
|
|
|
|
|
|
+ * First, count the number of 'real' matchsets. Due to an issue with
|
|
|
|
|
|
+ * the old implementation, matchsets containing only the RSSI attribute
|
|
|
|
|
|
+ * (NL80211_SCHED_SCAN_MATCH_ATTR_RSSI) are considered as the 'default'
|
|
|
|
|
|
+ * RSSI for all matchsets, rather than their own matchset for reporting
|
|
|
|
|
|
+ * all APs with a strong RSSI. This is needed to be compatible with
|
|
|
|
|
|
+ * older userspace that treated a matchset with only the RSSI as the
|
|
|
|
|
|
+ * global RSSI for all other matchsets - if there are other matchsets.
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ if (info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH]) {
|
|
|
|
|
|
nla_for_each_nested(attr,
|
|
|
|
|
|
info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
|
|
|
|
|
|
- tmp)
|
|
|
|
|
|
- n_match_sets++;
|
|
|
|
|
|
+ tmp) {
|
|
|
|
|
|
+ struct nlattr *rssi;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
|
|
|
|
|
|
+ nla_data(attr), nla_len(attr),
|
|
|
|
|
|
+ nl80211_match_policy);
|
|
|
|
|
|
+ if (err)
|
|
|
|
|
|
+ return err;
|
|
|
|
|
|
+ /* add other standalone attributes here */
|
|
|
|
|
|
+ if (tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID]) {
|
|
|
|
|
|
+ n_match_sets++;
|
|
|
|
|
|
+ continue;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
|
|
|
|
|
|
+ if (rssi)
|
|
|
|
|
|
+ default_match_rssi = nla_get_s32(rssi);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
+ /* However, if there's no other matchset, add the RSSI one */
|
|
|
|
|
|
+ if (!n_match_sets && default_match_rssi != NL80211_SCAN_RSSI_THOLD_OFF)
|
|
|
|
|
|
+ n_match_sets = 1;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (n_match_sets > wiphy->max_match_sets)
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
@@ -5634,11 +5669,22 @@ static int nl80211_start_sched_scan(stru
|
|
|
|
|
|
tmp) {
|
|
|
|
|
|
struct nlattr *ssid, *rssi;
|
|
|
|
|
|
|
|
|
|
|
|
- nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
|
|
|
|
|
|
- nla_data(attr), nla_len(attr),
|
|
|
|
|
|
- nl80211_match_policy);
|
|
|
|
|
|
+ err = nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
|
|
|
|
|
|
+ nla_data(attr), nla_len(attr),
|
|
|
|
|
|
+ nl80211_match_policy);
|
|
|
|
|
|
+ if (err)
|
|
|
|
|
|
+ goto out_free;
|
|
|
|
|
|
ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
|
|
|
|
|
|
if (ssid) {
|
|
|
|
|
|
+ if (WARN_ON(i >= n_match_sets)) {
|
|
|
|
|
|
+ /* this indicates a programming error,
|
|
|
|
|
|
+ * the loop above should have verified
|
|
|
|
|
|
+ * things properly
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ err = -EINVAL;
|
|
|
|
|
|
+ goto out_free;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
|
|
|
|
|
|
err = -EINVAL;
|
|
|
|
|
|
goto out_free;
|
|
|
|
|
|
@@ -5647,15 +5693,28 @@ static int nl80211_start_sched_scan(stru
|
|
|
|
|
|
nla_data(ssid), nla_len(ssid));
|
|
|
|
|
|
request->match_sets[i].ssid.ssid_len =
|
|
|
|
|
|
nla_len(ssid);
|
|
|
|
|
|
+ /* special attribute - old implemenation w/a */
|
|
|
|
|
|
+ request->match_sets[i].rssi_thold =
|
|
|
|
|
|
+ default_match_rssi;
|
|
|
|
|
|
+ rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
|
|
|
|
|
|
+ if (rssi)
|
|
|
|
|
|
+ request->match_sets[i].rssi_thold =
|
|
|
|
|
|
+ nla_get_s32(rssi);
|
|
|
|
|
|
}
|
|
|
|
|
|
- rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
|
|
|
|
|
|
- if (rssi)
|
|
|
|
|
|
- request->rssi_thold = nla_get_u32(rssi);
|
|
|
|
|
|
- else
|
|
|
|
|
|
- request->rssi_thold =
|
|
|
|
|
|
- NL80211_SCAN_RSSI_THOLD_OFF;
|
|
|
|
|
|
i++;
|
|
|
|
|
|
}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ /* there was no other matchset, so the RSSI one is alone */
|
|
|
|
|
|
+ if (i == 0)
|
|
|
|
|
|
+ request->match_sets[0].rssi_thold = default_match_rssi;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ request->min_rssi_thold = INT_MAX;
|
|
|
|
|
|
+ for (i = 0; i < n_match_sets; i++)
|
|
|
|
|
|
+ request->min_rssi_thold =
|
|
|
|
|
|
+ min(request->match_sets[i].rssi_thold,
|
|
|
|
|
|
+ request->min_rssi_thold);
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+ request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
|
|
|
|
|
|
}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (info->attrs[NL80211_ATTR_IE]) {
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -5751,7 +5810,7 @@ static int nl80211_start_radar_detection
|
|
|
|
|
|
|
|
|
|
|
|
err = rdev->ops->start_radar_detection(&rdev->wiphy, dev, &chandef);
|
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
- wdev->channel = chandef.chan;
|
|
|
|
|
|
+ wdev->chandef = chandef;
|
|
|
|
|
|
wdev->cac_started = true;
|
|
|
|
|
|
wdev->cac_start_time = jiffies;
|
|
|
|
|
|
}
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -7502,16 +7561,19 @@ static int nl80211_set_tx_bitrate_mask(s
|
|
|
|
|
|
* directly to the enum ieee80211_band values used in cfg80211.
|
|
|
|
|
|
*/
|
|
|
|
|
|
BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
|
|
|
|
|
|
- nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
|
|
|
|
|
|
- {
|
|
|
|
|
|
+ nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
|
|
|
|
|
|
enum ieee80211_band band = nla_type(tx_rates);
|
|
|
|
|
|
+ int err;
|
|
|
|
|
|
+
|
|
|
|
|
|
if (band < 0 || band >= IEEE80211_NUM_BANDS)
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
sband = rdev->wiphy.bands[band];
|
|
|
|
|
|
if (sband == NULL)
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
- nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
|
|
|
|
|
|
- nla_len(tx_rates), nl80211_txattr_policy);
|
|
|
|
|
|
+ err = nla_parse(tb, NL80211_TXRATE_MAX, nla_data(tx_rates),
|
|
|
|
|
|
+ nla_len(tx_rates), nl80211_txattr_policy);
|
|
|
|
|
|
+ if (err)
|
|
|
|
|
|
+ return err;
|
|
|
|
|
|
if (tb[NL80211_TXRATE_LEGACY]) {
|
|
|
|
|
|
mask.control[band].legacy = rateset_to_mask(
|
|
|
|
|
|
sband,
|
|
|
|
|
|
@@ -10054,40 +10116,31 @@ void nl80211_send_scan_start(struct cfg8
|
|
|
|
|
|
NL80211_MCGRP_SCAN, GFP_KERNEL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
- struct wireless_dev *wdev)
|
|
|
|
|
|
+struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ struct wireless_dev *wdev, bool aborted)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct sk_buff *msg;
|
|
|
|
|
|
|
|
|
|
|
|
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
|
|
if (!msg)
|
|
|
|
|
|
- return;
|
|
|
|
|
|
+ return NULL;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
|
|
|
|
|
|
- NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
|
|
|
|
|
|
+ aborted ? NL80211_CMD_SCAN_ABORTED :
|
|
|
|
|
|
+ NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
|
|
|
|
|
|
nlmsg_free(msg);
|
|
|
|
|
|
- return;
|
|
|
|
|
|
+ return NULL;
|
|
|
|
|
|
}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
|
|
|
|
|
|
- NL80211_MCGRP_SCAN, GFP_KERNEL);
|
|
|
|
|
|
+ return msg;
|
|
|
|
|
|
}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
-void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
- struct wireless_dev *wdev)
|
|
|
|
|
|
+void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ struct sk_buff *msg)
|
|
|
|
|
|
{
|
|
|
|
|
|
- struct sk_buff *msg;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
-
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
|
|
if (!msg)
|
|
|
|
|
|
return;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
|
|
|
|
|
|
- NL80211_CMD_SCAN_ABORTED) < 0) {
|
|
|
|
|
|
- nlmsg_free(msg);
|
|
|
|
|
|
- return;
|
|
|
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
|
|
|
genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
|
|
|
|
|
|
NL80211_MCGRP_SCAN, GFP_KERNEL);
|
|
|
|
|
|
}
|
2014-02-01 15:33:04 +00:00
|
|
|
|
@@ -11158,7 +11211,8 @@ void cfg80211_ch_switch_notify(struct ne
|
|
|
|
|
|
wdev->iftype != NL80211_IFTYPE_MESH_POINT))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
- wdev->channel = chandef->chan;
|
|
|
|
|
|
+ wdev->chandef = *chandef;
|
|
|
|
|
|
+ wdev->preset_chandef = *chandef;
|
|
|
|
|
|
nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
|
|
|
|
|
|
}
|
|
|
|
|
|
EXPORT_SYMBOL(cfg80211_ch_switch_notify);
|
|
|
|
|
|
@@ -11673,6 +11727,35 @@ void cfg80211_crit_proto_stopped(struct
|
2014-01-30 13:21:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
EXPORT_SYMBOL(cfg80211_crit_proto_stopped);
|
|
|
|
|
|
|
|
|
|
|
|
+void nl80211_send_ap_stopped(struct wireless_dev *wdev)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ struct wiphy *wiphy = wdev->wiphy;
|
|
|
|
|
|
+ struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
|
|
|
|
|
|
+ struct sk_buff *msg;
|
|
|
|
|
|
+ void *hdr;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
|
|
+ if (!msg)
|
|
|
|
|
|
+ return;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_STOP_AP);
|
|
|
|
|
|
+ if (!hdr)
|
|
|
|
|
|
+ goto out;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
|
|
|
|
|
|
+ nla_put_u32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex) ||
|
|
|
|
|
|
+ nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
|
|
|
|
|
|
+ goto out;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ genlmsg_end(msg, hdr);
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ genlmsg_multicast_netns(&nl80211_fam, wiphy_net(wiphy), msg, 0,
|
|
|
|
|
|
+ NL80211_MCGRP_MLME, GFP_KERNEL);
|
|
|
|
|
|
+ return;
|
|
|
|
|
|
+ out:
|
|
|
|
|
|
+ nlmsg_free(msg);
|
|
|
|
|
|
+}
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+
|
2014-01-30 13:21:36 +00:00
|
|
|
|
/* initialisation/exit functions */
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
int nl80211_init(void)
|
|
|
|
|
|
--- a/net/wireless/nl80211.h
|
|
|
|
|
|
+++ b/net/wireless/nl80211.h
|
|
|
|
|
|
@@ -8,10 +8,10 @@ void nl80211_exit(void);
|
|
|
|
|
|
void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
|
|
|
|
|
|
void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
struct wireless_dev *wdev);
|
|
|
|
|
|
-void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
- struct wireless_dev *wdev);
|
|
|
|
|
|
-void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
- struct wireless_dev *wdev);
|
|
|
|
|
|
+struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ struct wireless_dev *wdev, bool aborted);
|
|
|
|
|
|
+void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ struct sk_buff *msg);
|
|
|
|
|
|
void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
struct net_device *netdev, u32 cmd);
|
|
|
|
|
|
void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
@@ -74,6 +74,8 @@ nl80211_radar_notify(struct cfg80211_reg
|
|
|
|
|
|
enum nl80211_radar_event event,
|
|
|
|
|
|
struct net_device *netdev, gfp_t gfp);
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+void nl80211_send_ap_stopped(struct wireless_dev *wdev);
|
|
|
|
|
|
+
|
|
|
|
|
|
void cfg80211_rdev_free_coalesce(struct cfg80211_registered_device *rdev);
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
#endif /* __NET_WIRELESS_NL80211_H */
|
|
|
|
|
|
--- a/net/wireless/scan.c
|
|
|
|
|
|
+++ b/net/wireless/scan.c
|
|
|
|
|
|
@@ -161,18 +161,25 @@ static void __cfg80211_bss_expire(struct
|
|
|
|
|
|
dev->bss_generation++;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
-void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)
|
|
|
|
|
|
+void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
+ bool send_message)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct cfg80211_scan_request *request;
|
|
|
|
|
|
struct wireless_dev *wdev;
|
|
|
|
|
|
+ struct sk_buff *msg;
|
|
|
|
|
|
#ifdef CPTCFG_CFG80211_WEXT
|
|
|
|
|
|
union iwreq_data wrqu;
|
2013-12-08 14:48:30 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
ASSERT_RTNL();
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- request = rdev->scan_req;
|
|
|
|
|
|
+ if (rdev->scan_msg) {
|
|
|
|
|
|
+ nl80211_send_scan_result(rdev, rdev->scan_msg);
|
|
|
|
|
|
+ rdev->scan_msg = NULL;
|
|
|
|
|
|
+ return;
|
|
|
|
|
|
+ }
|
2013-12-08 14:48:30 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ request = rdev->scan_req;
|
|
|
|
|
|
if (!request)
|
|
|
|
|
|
return;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -186,18 +193,16 @@ void ___cfg80211_scan_done(struct cfg802
|
|
|
|
|
|
if (wdev->netdev)
|
|
|
|
|
|
cfg80211_sme_scan_done(wdev->netdev);
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (request->aborted) {
|
|
|
|
|
|
- nl80211_send_scan_aborted(rdev, wdev);
|
2013-12-19 17:18:07 +00:00
|
|
|
|
- } else {
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
|
|
|
|
|
|
- /* flush entries from previous scans */
|
|
|
|
|
|
- spin_lock_bh(&rdev->bss_lock);
|
|
|
|
|
|
- __cfg80211_bss_expire(rdev, request->scan_start);
|
|
|
|
|
|
- spin_unlock_bh(&rdev->bss_lock);
|
2013-12-19 17:18:07 +00:00
|
|
|
|
- }
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- nl80211_send_scan_done(rdev, wdev);
|
|
|
|
|
|
+ if (!request->aborted &&
|
|
|
|
|
|
+ request->flags & NL80211_SCAN_FLAG_FLUSH) {
|
|
|
|
|
|
+ /* flush entries from previous scans */
|
|
|
|
|
|
+ spin_lock_bh(&rdev->bss_lock);
|
|
|
|
|
|
+ __cfg80211_bss_expire(rdev, request->scan_start);
|
|
|
|
|
|
+ spin_unlock_bh(&rdev->bss_lock);
|
2013-12-19 17:18:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ msg = nl80211_build_scan_msg(rdev, wdev, request->aborted);
|
|
|
|
|
|
+
|
|
|
|
|
|
#ifdef CPTCFG_CFG80211_WEXT
|
|
|
|
|
|
if (wdev->netdev && !request->aborted) {
|
|
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
|
|
@@ -211,6 +216,11 @@ void ___cfg80211_scan_done(struct cfg802
|
2013-12-19 17:18:07 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
rdev->scan_req = NULL;
|
|
|
|
|
|
kfree(request);
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (!send_message)
|
|
|
|
|
|
+ rdev->scan_msg = msg;
|
2013-12-19 17:18:07 +00:00
|
|
|
|
+ else
|
2014-01-30 13:21:36 +00:00
|
|
|
|
+ nl80211_send_scan_result(rdev, msg);
|
|
|
|
|
|
}
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
void __cfg80211_scan_done(struct work_struct *wk)
|
|
|
|
|
|
@@ -221,7 +231,7 @@ void __cfg80211_scan_done(struct work_st
|
|
|
|
|
|
scan_done_wk);
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
rtnl_lock();
|
|
|
|
|
|
- ___cfg80211_scan_done(rdev);
|
|
|
|
|
|
+ ___cfg80211_scan_done(rdev, true);
|
|
|
|
|
|
rtnl_unlock();
|
|
|
|
|
|
}
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -1079,7 +1089,7 @@ int cfg80211_wext_siwscan(struct net_dev
|
|
|
|
|
|
if (IS_ERR(rdev))
|
|
|
|
|
|
return PTR_ERR(rdev);
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (rdev->scan_req) {
|
|
|
|
|
|
+ if (rdev->scan_req || rdev->scan_msg) {
|
|
|
|
|
|
err = -EBUSY;
|
|
|
|
|
|
goto out;
|
2013-12-14 17:07:08 +00:00
|
|
|
|
}
|
2014-01-30 13:21:36 +00:00
|
|
|
|
@@ -1481,7 +1491,7 @@ int cfg80211_wext_giwscan(struct net_dev
|
|
|
|
|
|
if (IS_ERR(rdev))
|
|
|
|
|
|
return PTR_ERR(rdev);
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (rdev->scan_req)
|
|
|
|
|
|
+ if (rdev->scan_req || rdev->scan_msg)
|
|
|
|
|
|
return -EAGAIN;
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
res = ieee80211_scan_results(rdev, info, extra, data->length);
|
|
|
|
|
|
--- a/net/wireless/sme.c
|
|
|
|
|
|
+++ b/net/wireless/sme.c
|
|
|
|
|
|
@@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wir
|
|
|
|
|
|
ASSERT_RDEV_LOCK(rdev);
|
|
|
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
- if (rdev->scan_req)
|
|
|
|
|
|
+ if (rdev->scan_req || rdev->scan_msg)
|
|
|
|
|
|
return -EBUSY;
|
2013-12-14 17:07:08 +00:00
|
|
|
|
|
2014-01-30 13:21:36 +00:00
|
|
|
|
if (wdev->conn->params.channel)
|
2014-02-01 15:33:04 +00:00
|
|
|
|
--- a/net/mac80211/mlme.c
|
|
|
|
|
|
+++ b/net/mac80211/mlme.c
|
|
|
|
|
|
@@ -1001,7 +1001,6 @@ ieee80211_sta_process_chanswitch(struct
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
|
|
|
|
|
|
- sdata->vif.csa_active = true;
|
|
|
|
|
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
|
|
|
|
|
if (local->use_chanctx) {
|
|
|
|
|
|
@@ -1039,6 +1038,7 @@ ieee80211_sta_process_chanswitch(struct
|
|
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
|
|
|
|
|
|
|
|
sdata->csa_chandef = csa_ie.chandef;
|
|
|
|
|
|
+ sdata->vif.csa_active = true;
|
|
|
|
|
|
|
|
|
|
|
|
if (csa_ie.mode)
|
|
|
|
|
|
ieee80211_stop_queues_by_reason(&local->hw,
|
|
|
|
|
|
--- a/net/mac80211/chan.c
|
|
|
|
|
|
+++ b/net/mac80211/chan.c
|
|
|
|
|
|
@@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(
|
|
|
|
|
|
{
|
|
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
|
|
|
|
|
|
|
+ lockdep_assert_held(&local->mtx);
|
|
|
|
|
|
+
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
|
|
|
|
|
if (sdata->radar_required) {
|
|
|
|
|
|
--- a/net/mac80211/ibss.c
|
|
|
|
|
|
+++ b/net/mac80211/ibss.c
|
|
|
|
|
|
@@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(st
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
|
|
- ieee80211_vif_release_channel(sdata);
|
|
|
|
|
|
if (ieee80211_vif_use_channel(sdata, &chandef,
|
|
|
|
|
|
ifibss->fixed_channel ?
|
|
|
|
|
|
IEEE80211_CHANCTX_SHARED :
|
|
|
|
|
|
@@ -303,6 +302,7 @@ static void __ieee80211_sta_join_ibss(st
|
|
|
|
|
|
mutex_unlock(&local->mtx);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
+ sdata->radar_required = radar_required;
|
|
|
|
|
|
mutex_unlock(&local->mtx);
|
|
|
|
|
|
|
|
|
|
|
|
memcpy(ifibss->bssid, bssid, ETH_ALEN);
|
|
|
|
|
|
@@ -318,7 +318,6 @@ static void __ieee80211_sta_join_ibss(st
|
|
|
|
|
|
rcu_assign_pointer(ifibss->presp, presp);
|
|
|
|
|
|
mgmt = (void *)presp->head;
|
|
|
|
|
|
|
|
|
|
|
|
- sdata->radar_required = radar_required;
|
|
|
|
|
|
sdata->vif.bss_conf.enable_beacon = true;
|
|
|
|
|
|
sdata->vif.bss_conf.beacon_int = beacon_int;
|
|
|
|
|
|
sdata->vif.bss_conf.basic_rates = basic_rates;
|
|
|
|
|
|
@@ -386,7 +385,7 @@ static void __ieee80211_sta_join_ibss(st
|
|
|
|
|
|
presp->head_len, 0, GFP_KERNEL);
|
|
|
|
|
|
cfg80211_put_bss(local->hw.wiphy, bss);
|
|
|
|
|
|
netif_carrier_on(sdata->dev);
|
|
|
|
|
|
- cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
|
|
|
|
|
|
@@ -802,6 +801,8 @@ ieee80211_ibss_process_chanswitch(struct
|
|
|
|
|
|
int err;
|
|
|
|
|
|
u32 sta_flags;
|
|
|
|
|
|
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
+
|
|
|
|
|
|
sta_flags = IEEE80211_STA_DISABLE_VHT;
|
|
|
|
|
|
switch (ifibss->chandef.width) {
|
|
|
|
|
|
case NL80211_CHAN_WIDTH_5:
|
|
|
|
|
|
@@ -1471,6 +1472,11 @@ static void ieee80211_rx_mgmt_probe_req(
|
|
|
|
|
|
memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
|
|
|
|
|
|
ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
|
|
|
|
|
|
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ /* avoid excessive retries for probe request to wildcard SSIDs */
|
|
|
|
|
|
+ if (pos[1] == 0)
|
|
|
|
|
|
+ IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
|
|
|
|
|
|
+
|
|
|
|
|
|
ieee80211_tx_skb(sdata, skb);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
--- a/net/mac80211/mesh.c
|
|
|
|
|
|
+++ b/net/mac80211/mesh.c
|
|
|
|
|
|
@@ -872,6 +872,8 @@ ieee80211_mesh_process_chnswitch(struct
|
|
|
|
|
|
if (!ifmsh->mesh_id)
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
+ sdata_assert_lock(sdata);
|
|
|
|
|
|
+
|
|
|
|
|
|
sta_flags = IEEE80211_STA_DISABLE_VHT;
|
|
|
|
|
|
switch (sdata->vif.bss_conf.chandef.width) {
|
|
|
|
|
|
case NL80211_CHAN_WIDTH_20_NOHT:
|
|
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
|
|
|
|
|
|
@@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf
|
|
|
|
|
|
struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
|
|
|
|
|
|
struct net_device *ndev = ifp->ndev;
|
|
|
|
|
|
struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
|
|
|
|
|
|
+ struct ieee80211_channel *chan;
|
|
|
|
|
|
s32 err = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (ifp->vif->mode == WL_MODE_AP) {
|
|
|
|
|
|
@@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf
|
|
|
|
|
|
} else if (brcmf_is_linkup(e)) {
|
|
|
|
|
|
brcmf_dbg(CONN, "Linkup\n");
|
|
|
|
|
|
if (brcmf_is_ibssmode(ifp->vif)) {
|
|
|
|
|
|
+ chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);
|
|
|
|
|
|
memcpy(profile->bssid, e->addr, ETH_ALEN);
|
|
|
|
|
|
wl_inform_ibss(cfg, ndev, e->addr);
|
|
|
|
|
|
- cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);
|
|
|
|
|
|
clear_bit(BRCMF_VIF_STATUS_CONNECTING,
|
|
|
|
|
|
&ifp->vif->sme_state);
|
|
|
|
|
|
set_bit(BRCMF_VIF_STATUS_CONNECTED,
|
|
|
|
|
|
--- a/drivers/net/wireless/libertas/cfg.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/libertas/cfg.c
|
|
|
|
|
|
@@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_pri
|
|
|
|
|
|
memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
|
|
|
|
|
|
priv->wdev->ssid_len = params->ssid_len;
|
|
|
|
|
|
|
|
|
|
|
|
- cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,
|
|
|
|
|
|
+ GFP_KERNEL);
|
|
|
|
|
|
|
|
|
|
|
|
/* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
|
|
|
|
|
|
priv->connect_status = LBS_CONNECTED;
|
|
|
|
|
|
--- a/drivers/net/wireless/mwifiex/cfg80211.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
|
|
|
|
|
|
@@ -1881,7 +1881,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy
|
|
|
|
|
|
params->privacy);
|
|
|
|
|
|
done:
|
|
|
|
|
|
if (!ret) {
|
|
|
|
|
|
- cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
|
|
|
|
|
|
+ params->chandef.chan, GFP_KERNEL);
|
|
|
|
|
|
dev_dbg(priv->adapter->dev,
|
|
|
|
|
|
"info: joined/created adhoc network with bssid"
|
|
|
|
|
|
" %pM successfully\n", priv->cfg_bssid);
|
|
|
|
|
|
--- a/drivers/net/wireless/rndis_wlan.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/rndis_wlan.c
|
|
|
|
|
|
@@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(s
|
|
|
|
|
|
bssid, req_ie, req_ie_len,
|
|
|
|
|
|
resp_ie, resp_ie_len, GFP_KERNEL);
|
|
|
|
|
|
} else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
|
|
|
|
|
|
- cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
|
|
|
|
|
|
+ cfg80211_ibss_joined(usbdev->net, bssid,
|
|
|
|
|
|
+ get_current_channel(usbdev, NULL),
|
|
|
|
|
|
+ GFP_KERNEL);
|
|
|
|
|
|
|
|
|
|
|
|
kfree(info);
|
|
|
|
|
|
|
|
|
|
|
|
--- a/net/wireless/ibss.c
|
|
|
|
|
|
+++ b/net/wireless/ibss.c
|
|
|
|
|
|
@@ -14,7 +14,8 @@
|
|
|
|
|
|
#include "rdev-ops.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
|
|
|
|
|
|
+void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
|
|
|
|
|
|
+ struct ieee80211_channel *channel)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
|
struct cfg80211_bss *bss;
|
|
|
|
|
|
@@ -28,8 +29,7 @@ void __cfg80211_ibss_joined(struct net_d
|
|
|
|
|
|
if (!wdev->ssid_len)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
- bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
|
|
|
|
|
|
- wdev->ssid, wdev->ssid_len,
|
|
|
|
|
|
+ bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0,
|
|
|
|
|
|
WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
|
|
|
|
|
|
|
|
|
|
|
|
if (WARN_ON(!bss))
|
|
|
|
|
|
@@ -54,21 +54,26 @@ void __cfg80211_ibss_joined(struct net_d
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
|
|
|
|
|
|
+void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
|
|
|
|
|
|
+ struct ieee80211_channel *channel, gfp_t gfp)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
|
|
struct cfg80211_event *ev;
|
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
|
|
|
|
- trace_cfg80211_ibss_joined(dev, bssid);
|
|
|
|
|
|
+ trace_cfg80211_ibss_joined(dev, bssid, channel);
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (WARN_ON(!channel))
|
|
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
|
|
|
|
ev = kzalloc(sizeof(*ev), gfp);
|
|
|
|
|
|
if (!ev)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
ev->type = EVENT_IBSS_JOINED;
|
|
|
|
|
|
- memcpy(ev->cr.bssid, bssid, ETH_ALEN);
|
|
|
|
|
|
+ memcpy(ev->ij.bssid, bssid, ETH_ALEN);
|
|
|
|
|
|
+ ev->ij.channel = channel;
|
|
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&wdev->event_lock, flags);
|
|
|
|
|
|
list_add_tail(&ev->list, &wdev->event_list);
|
|
|
|
|
|
@@ -117,6 +122,7 @@ int __cfg80211_join_ibss(struct cfg80211
|
|
|
|
|
|
|
|
|
|
|
|
wdev->ibss_fixed = params->channel_fixed;
|
|
|
|
|
|
wdev->ibss_dfs_possible = params->userspace_handles_dfs;
|
|
|
|
|
|
+ wdev->chandef = params->chandef;
|
|
|
|
|
|
#ifdef CPTCFG_CFG80211_WEXT
|
|
|
|
|
|
wdev->wext.ibss.chandef = params->chandef;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
@@ -200,6 +206,7 @@ static void __cfg80211_clear_ibss(struct
|
|
|
|
|
|
|
|
|
|
|
|
wdev->current_bss = NULL;
|
|
|
|
|
|
wdev->ssid_len = 0;
|
|
|
|
|
|
+ memset(&wdev->chandef, 0, sizeof(wdev->chandef));
|
|
|
|
|
|
#ifdef CPTCFG_CFG80211_WEXT
|
|
|
|
|
|
if (!nowext)
|
|
|
|
|
|
wdev->wext.ibss.ssid_len = 0;
|
|
|
|
|
|
--- a/net/wireless/trace.h
|
|
|
|
|
|
+++ b/net/wireless/trace.h
|
|
|
|
|
|
@@ -2278,11 +2278,6 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
|
|
|
|
|
|
TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
-DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
|
|
|
|
|
|
- TP_PROTO(struct net_device *netdev, const u8 *addr),
|
|
|
|
|
|
- TP_ARGS(netdev, addr)
|
|
|
|
|
|
-);
|
|
|
|
|
|
-
|
|
|
|
|
|
DEFINE_EVENT(cfg80211_rx_evt, cfg80211_rx_spurious_frame,
|
|
|
|
|
|
TP_PROTO(struct net_device *netdev, const u8 *addr),
|
|
|
|
|
|
TP_ARGS(netdev, addr)
|
|
|
|
|
|
@@ -2293,6 +2288,24 @@ DEFINE_EVENT(cfg80211_rx_evt, cfg80211_r
|
|
|
|
|
|
TP_ARGS(netdev, addr)
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
+TRACE_EVENT(cfg80211_ibss_joined,
|
|
|
|
|
|
+ TP_PROTO(struct net_device *netdev, const u8 *bssid,
|
|
|
|
|
|
+ struct ieee80211_channel *channel),
|
|
|
|
|
|
+ TP_ARGS(netdev, bssid, channel),
|
|
|
|
|
|
+ TP_STRUCT__entry(
|
|
|
|
|
|
+ NETDEV_ENTRY
|
|
|
|
|
|
+ MAC_ENTRY(bssid)
|
|
|
|
|
|
+ CHAN_ENTRY
|
|
|
|
|
|
+ ),
|
|
|
|
|
|
+ TP_fast_assign(
|
|
|
|
|
|
+ NETDEV_ASSIGN;
|
|
|
|
|
|
+ MAC_ASSIGN(bssid, bssid);
|
|
|
|
|
|
+ CHAN_ASSIGN(channel);
|
|
|
|
|
|
+ ),
|
|
|
|
|
|
+ TP_printk(NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", " CHAN_PR_FMT,
|
|
|
|
|
|
+ NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
|
|
|
|
|
|
+);
|
|
|
|
|
|
+
|
|
|
|
|
|
TRACE_EVENT(cfg80211_probe_status,
|
|
|
|
|
|
TP_PROTO(struct net_device *netdev, const u8 *addr, u64 cookie,
|
|
|
|
|
|
bool acked),
|
|
|
|
|
|
--- a/net/wireless/util.c
|
|
|
|
|
|
+++ b/net/wireless/util.c
|
|
|
|
|
|
@@ -820,7 +820,8 @@ void cfg80211_process_wdev_events(struct
|
|
|
|
|
|
ev->dc.reason, true);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case EVENT_IBSS_JOINED:
|
|
|
|
|
|
- __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid);
|
|
|
|
|
|
+ __cfg80211_ibss_joined(wdev->netdev, ev->ij.bssid,
|
|
|
|
|
|
+ ev->ij.channel);
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
|
@@ -1356,7 +1357,7 @@ int cfg80211_can_use_iftype_chan(struct
|
|
|
|
|
|
*/
|
|
|
|
|
|
mutex_lock_nested(&wdev_iter->mtx, 1);
|
|
|
|
|
|
__acquire(wdev_iter->mtx);
|
|
|
|
|
|
- cfg80211_get_chan_state(wdev_iter, &ch, &chmode);
|
|
|
|
|
|
+ cfg80211_get_chan_state(wdev_iter, &ch, &chmode, &radar_detect);
|
|
|
|
|
|
wdev_unlock(wdev_iter);
|
|
|
|
|
|
|
|
|
|
|
|
switch (chmode) {
|
|
|
|
|
|
--- a/net/wireless/chan.c
|
|
|
|
|
|
+++ b/net/wireless/chan.c
|
|
|
|
|
|
@@ -642,7 +642,8 @@ int cfg80211_set_monitor_channel(struct
|
|
|
|
|
|
void
|
|
|
|
|
|
cfg80211_get_chan_state(struct wireless_dev *wdev,
|
|
|
|
|
|
struct ieee80211_channel **chan,
|
|
|
|
|
|
- enum cfg80211_chan_mode *chanmode)
|
|
|
|
|
|
+ enum cfg80211_chan_mode *chanmode,
|
|
|
|
|
|
+ u8 *radar_detect)
|
|
|
|
|
|
{
|
|
|
|
|
|
*chan = NULL;
|
|
|
|
|
|
*chanmode = CHAN_MODE_UNDEFINED;
|
|
|
|
|
|
@@ -660,6 +661,11 @@ cfg80211_get_chan_state(struct wireless_
|
|
|
|
|
|
!wdev->ibss_dfs_possible)
|
|
|
|
|
|
? CHAN_MODE_SHARED
|
|
|
|
|
|
: CHAN_MODE_EXCLUSIVE;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ /* consider worst-case - IBSS can try to return to the
|
|
|
|
|
|
+ * original user-specified channel as creator */
|
|
|
|
|
|
+ if (wdev->ibss_dfs_possible)
|
|
|
|
|
|
+ *radar_detect |= BIT(wdev->chandef.width);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
@@ -674,17 +680,26 @@ cfg80211_get_chan_state(struct wireless_
|
|
|
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
|
|
case NL80211_IFTYPE_P2P_GO:
|
|
|
|
|
|
if (wdev->cac_started) {
|
|
|
|
|
|
- *chan = wdev->channel;
|
|
|
|
|
|
+ *chan = wdev->chandef.chan;
|
|
|
|
|
|
*chanmode = CHAN_MODE_SHARED;
|
|
|
|
|
|
+ *radar_detect |= BIT(wdev->chandef.width);
|
|
|
|
|
|
} else if (wdev->beacon_interval) {
|
|
|
|
|
|
- *chan = wdev->channel;
|
|
|
|
|
|
+ *chan = wdev->chandef.chan;
|
|
|
|
|
|
*chanmode = CHAN_MODE_SHARED;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (cfg80211_chandef_dfs_required(wdev->wiphy,
|
|
|
|
|
|
+ &wdev->chandef))
|
|
|
|
|
|
+ *radar_detect |= BIT(wdev->chandef.width);
|
|
|
|
|
|
}
|
|
|
|
|
|
return;
|
|
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
|
|
|
|
|
if (wdev->mesh_id_len) {
|
|
|
|
|
|
- *chan = wdev->channel;
|
|
|
|
|
|
+ *chan = wdev->chandef.chan;
|
|
|
|
|
|
*chanmode = CHAN_MODE_SHARED;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (cfg80211_chandef_dfs_required(wdev->wiphy,
|
|
|
|
|
|
+ &wdev->chandef))
|
|
|
|
|
|
+ *radar_detect |= BIT(wdev->chandef.width);
|
|
|
|
|
|
}
|
|
|
|
|
|
return;
|
|
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
|
|
|
|
--- a/net/wireless/mesh.c
|
|
|
|
|
|
+++ b/net/wireless/mesh.c
|
|
|
|
|
|
@@ -195,7 +195,7 @@ int __cfg80211_join_mesh(struct cfg80211
|
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
|
|
|
|
|
|
wdev->mesh_id_len = setup->mesh_id_len;
|
|
|
|
|
|
- wdev->channel = setup->chandef.chan;
|
|
|
|
|
|
+ wdev->chandef = setup->chandef;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
|
@@ -244,7 +244,7 @@ int cfg80211_set_mesh_channel(struct cfg
|
|
|
|
|
|
err = rdev_libertas_set_mesh_channel(rdev, wdev->netdev,
|
|
|
|
|
|
chandef->chan);
|
|
|
|
|
|
if (!err)
|
|
|
|
|
|
- wdev->channel = chandef->chan;
|
|
|
|
|
|
+ wdev->chandef = *chandef;
|
|
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -276,7 +276,7 @@ static int __cfg80211_leave_mesh(struct
|
|
|
|
|
|
err = rdev_leave_mesh(rdev, dev);
|
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
wdev->mesh_id_len = 0;
|
|
|
|
|
|
- wdev->channel = NULL;
|
|
|
|
|
|
+ memset(&wdev->chandef, 0, sizeof(wdev->chandef));
|
|
|
|
|
|
rdev_set_qos_map(rdev, dev, NULL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
--- a/net/wireless/mlme.c
|
|
|
|
|
|
+++ b/net/wireless/mlme.c
|
|
|
|
|
|
@@ -772,7 +772,7 @@ void cfg80211_cac_event(struct net_devic
|
|
|
|
|
|
if (WARN_ON(!wdev->cac_started))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
- if (WARN_ON(!wdev->channel))
|
|
|
|
|
|
+ if (WARN_ON(!wdev->chandef.chan))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
switch (event) {
|
2014-02-03 10:53:24 +00:00
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
|
|
|
|
|
|
@@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (is2GHz && !twiceMaxEdgePower)
|
|
|
|
|
|
+ twiceMaxEdgePower = 60;
|
|
|
|
|
|
+
|
|
|
|
|
|
return twiceMaxEdgePower;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-02-07 18:08:57 +00:00
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
|
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
|
|
|
|
|
|
@@ -23,10 +23,11 @@
|
|
|
|
|
|
#define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
|
|
|
|
|
|
#define MAX_MAG_DELTA 11
|
|
|
|
|
|
#define MAX_PHS_DELTA 10
|
|
|
|
|
|
+#define MAXIQCAL 3
|
|
|
|
|
|
|
|
|
|
|
|
struct coeff {
|
|
|
|
|
|
- int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
|
|
|
|
|
|
- int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
|
|
|
|
|
|
+ int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
|
|
|
|
|
|
+ int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MAXIQCAL];
|
|
|
|
|
|
int iqc_coeff[2];
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@@ -800,7 +801,7 @@ static bool ar9003_hw_calc_iq_corr(struc
|
|
|
|
|
|
if (q_q_coff > 63)
|
|
|
|
|
|
q_q_coff = 63;
|
|
|
|
|
|
|
|
|
|
|
|
- iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;
|
|
|
|
|
|
+ iqc_coeff[0] = (q_q_coff * 128) + (0x7f & q_i_coff);
|
|
|
|
|
|
|
|
|
|
|
|
ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",
|
|
|
|
|
|
chain_idx, iqc_coeff[0]);
|
|
|
|
|
|
@@ -831,7 +832,7 @@ static bool ar9003_hw_calc_iq_corr(struc
|
|
|
|
|
|
if (q_q_coff > 63)
|
|
|
|
|
|
q_q_coff = 63;
|
|
|
|
|
|
|
|
|
|
|
|
- iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;
|
|
|
|
|
|
+ iqc_coeff[1] = (q_q_coff * 128) + (0x7f & q_i_coff);
|
|
|
|
|
|
|
|
|
|
|
|
ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",
|
|
|
|
|
|
chain_idx, iqc_coeff[1]);
|
|
|
|
|
|
@@ -839,7 +840,8 @@ static bool ar9003_hw_calc_iq_corr(struc
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
|
|
|
|
|
|
+static void ar9003_hw_detect_outlier(int mp_coeff[][MAXIQCAL],
|
|
|
|
|
|
+ int nmeasurement,
|
|
|
|
|
|
int max_delta)
|
|
|
|
|
|
{
|
|
|
|
|
|
int mp_max = -64, max_idx = 0;
|
|
|
|
|
|
@@ -848,20 +850,20 @@ static void ar9003_hw_detect_outlier(int
|
|
|
|
|
|
|
|
|
|
|
|
/* find min/max mismatch across all calibrated gains */
|
|
|
|
|
|
for (i = 0; i < nmeasurement; i++) {
|
|
|
|
|
|
- if (mp_coeff[i] > mp_max) {
|
|
|
|
|
|
- mp_max = mp_coeff[i];
|
|
|
|
|
|
+ if (mp_coeff[i][0] > mp_max) {
|
|
|
|
|
|
+ mp_max = mp_coeff[i][0];
|
|
|
|
|
|
max_idx = i;
|
|
|
|
|
|
- } else if (mp_coeff[i] < mp_min) {
|
|
|
|
|
|
- mp_min = mp_coeff[i];
|
|
|
|
|
|
+ } else if (mp_coeff[i][0] < mp_min) {
|
|
|
|
|
|
+ mp_min = mp_coeff[i][0];
|
|
|
|
|
|
min_idx = i;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* find average (exclude max abs value) */
|
|
|
|
|
|
for (i = 0; i < nmeasurement; i++) {
|
|
|
|
|
|
- if ((abs(mp_coeff[i]) < abs(mp_max)) ||
|
|
|
|
|
|
- (abs(mp_coeff[i]) < abs(mp_min))) {
|
|
|
|
|
|
- mp_avg += mp_coeff[i];
|
|
|
|
|
|
+ if ((abs(mp_coeff[i][0]) < abs(mp_max)) ||
|
|
|
|
|
|
+ (abs(mp_coeff[i][0]) < abs(mp_min))) {
|
|
|
|
|
|
+ mp_avg += mp_coeff[i][0];
|
|
|
|
|
|
mp_count++;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -873,7 +875,7 @@ static void ar9003_hw_detect_outlier(int
|
|
|
|
|
|
if (mp_count)
|
|
|
|
|
|
mp_avg /= mp_count;
|
|
|
|
|
|
else
|
|
|
|
|
|
- mp_avg = mp_coeff[nmeasurement - 1];
|
|
|
|
|
|
+ mp_avg = mp_coeff[nmeasurement - 1][0];
|
|
|
|
|
|
|
|
|
|
|
|
/* detect outlier */
|
|
|
|
|
|
if (abs(mp_max - mp_min) > max_delta) {
|
|
|
|
|
|
@@ -882,15 +884,16 @@ static void ar9003_hw_detect_outlier(int
|
|
|
|
|
|
else
|
|
|
|
|
|
outlier_idx = min_idx;
|
|
|
|
|
|
|
|
|
|
|
|
- mp_coeff[outlier_idx] = mp_avg;
|
|
|
|
|
|
+ mp_coeff[outlier_idx][0] = mp_avg;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
|
|
|
|
|
|
- struct coeff *coeff,
|
|
|
|
|
|
- bool is_reusable)
|
|
|
|
|
|
+static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
|
|
|
|
|
|
+ struct coeff *coeff,
|
|
|
|
|
|
+ bool is_reusable)
|
|
|
|
|
|
{
|
|
|
|
|
|
int i, im, nmeasurement;
|
|
|
|
|
|
+ int magnitude, phase;
|
|
|
|
|
|
u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
|
|
|
|
|
|
struct ath9k_hw_cal_data *caldata = ah->caldata;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -920,21 +923,30 @@ static void ar9003_hw_tx_iqcal_load_avg_
|
|
|
|
|
|
if (nmeasurement > MAX_MEASUREMENT)
|
|
|
|
|
|
nmeasurement = MAX_MEASUREMENT;
|
|
|
|
|
|
|
|
|
|
|
|
- /* detect outlier only if nmeasurement > 1 */
|
|
|
|
|
|
- if (nmeasurement > 1) {
|
|
|
|
|
|
- /* Detect magnitude outlier */
|
|
|
|
|
|
- ar9003_hw_detect_outlier(coeff->mag_coeff[i],
|
|
|
|
|
|
- nmeasurement, MAX_MAG_DELTA);
|
|
|
|
|
|
-
|
|
|
|
|
|
- /* Detect phase outlier */
|
|
|
|
|
|
- ar9003_hw_detect_outlier(coeff->phs_coeff[i],
|
|
|
|
|
|
- nmeasurement, MAX_PHS_DELTA);
|
|
|
|
|
|
+ /*
|
|
|
|
|
|
+ * Skip normal outlier detection for AR9550.
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ if (!AR_SREV_9550(ah)) {
|
|
|
|
|
|
+ /* detect outlier only if nmeasurement > 1 */
|
|
|
|
|
|
+ if (nmeasurement > 1) {
|
|
|
|
|
|
+ /* Detect magnitude outlier */
|
|
|
|
|
|
+ ar9003_hw_detect_outlier(coeff->mag_coeff[i],
|
|
|
|
|
|
+ nmeasurement,
|
|
|
|
|
|
+ MAX_MAG_DELTA);
|
|
|
|
|
|
+
|
|
|
|
|
|
+ /* Detect phase outlier */
|
|
|
|
|
|
+ ar9003_hw_detect_outlier(coeff->phs_coeff[i],
|
|
|
|
|
|
+ nmeasurement,
|
|
|
|
|
|
+ MAX_PHS_DELTA);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (im = 0; im < nmeasurement; im++) {
|
|
|
|
|
|
+ magnitude = coeff->mag_coeff[i][im][0];
|
|
|
|
|
|
+ phase = coeff->phs_coeff[i][im][0];
|
|
|
|
|
|
|
|
|
|
|
|
- coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
|
|
|
|
|
|
- ((coeff->phs_coeff[i][im] & 0x7f) << 7);
|
|
|
|
|
|
+ coeff->iqc_coeff[0] =
|
|
|
|
|
|
+ (phase & 0x7f) | ((magnitude & 0x7f) << 7);
|
|
|
|
|
|
|
|
|
|
|
|
if ((im % 2) == 0)
|
|
|
|
|
|
REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
|
|
|
|
|
|
@@ -991,7 +1003,63 @@ static bool ar9003_hw_tx_iq_cal_run(stru
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
|
|
|
|
|
|
+static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,
|
|
|
|
|
|
+ struct coeff *coeff,
|
|
|
|
|
|
+ int i, int nmeasurement)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
|
+ int im, ix, iy, temp;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ for (im = 0; im < nmeasurement; im++) {
|
|
|
|
|
|
+ for (ix = 0; ix < MAXIQCAL - 1; ix++) {
|
|
|
|
|
|
+ for (iy = ix + 1; iy <= MAXIQCAL - 1; iy++) {
|
|
|
|
|
|
+ if (coeff->mag_coeff[i][im][iy] <
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][ix]) {
|
|
|
|
|
|
+ temp = coeff->mag_coeff[i][im][ix];
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][ix] =
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][iy];
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][iy] = temp;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ if (coeff->phs_coeff[i][im][iy] <
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][ix]) {
|
|
|
|
|
|
+ temp = coeff->phs_coeff[i][im][ix];
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][ix] =
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][iy];
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][iy] = temp;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][0] = coeff->mag_coeff[i][im][MAXIQCAL / 2];
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][0] = coeff->phs_coeff[i][im][MAXIQCAL / 2];
|
|
|
|
|
|
+
|
|
|
|
|
|
+ ath_dbg(common, CALIBRATE,
|
|
|
|
|
|
+ "IQCAL: Median [ch%d][gain%d]: mag = %d phase = %d\n",
|
|
|
|
|
|
+ i, im,
|
|
|
|
|
|
+ coeff->mag_coeff[i][im][0],
|
|
|
|
|
|
+ coeff->phs_coeff[i][im][0]);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+}
|
|
|
|
|
|
+
|
|
|
|
|
|
+static bool ar955x_tx_iq_cal_median(struct ath_hw *ah,
|
|
|
|
|
|
+ struct coeff *coeff,
|
|
|
|
|
|
+ int iqcal_idx,
|
|
|
|
|
|
+ int nmeasurement)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ int i;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if ((iqcal_idx + 1) != MAXIQCAL)
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ for (i = 0; i < AR9300_MAX_CHAINS; i++) {
|
|
|
|
|
|
+ __ar955x_tx_iq_cal_sort(ah, coeff, i, nmeasurement);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
+ return true;
|
|
|
|
|
|
+}
|
|
|
|
|
|
+
|
|
|
|
|
|
+static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
|
|
|
|
|
|
+ int iqcal_idx,
|
|
|
|
|
|
+ bool is_reusable)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
|
const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
|
|
|
|
|
|
@@ -1004,10 +1072,11 @@ static void ar9003_hw_tx_iq_cal_post_pro
|
|
|
|
|
|
AR_PHY_CHAN_INFO_TAB_1,
|
|
|
|
|
|
AR_PHY_CHAN_INFO_TAB_2,
|
|
|
|
|
|
};
|
|
|
|
|
|
- struct coeff coeff;
|
|
|
|
|
|
+ static struct coeff coeff;
|
|
|
|
|
|
s32 iq_res[6];
|
|
|
|
|
|
int i, im, j;
|
|
|
|
|
|
- int nmeasurement;
|
|
|
|
|
|
+ int nmeasurement = 0;
|
|
|
|
|
|
+ bool outlier_detect = true;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < AR9300_MAX_CHAINS; i++) {
|
|
|
|
|
|
if (!(ah->txchainmask & (1 << i)))
|
|
|
|
|
|
@@ -1065,17 +1134,23 @@ static void ar9003_hw_tx_iq_cal_post_pro
|
|
|
|
|
|
goto tx_iqcal_fail;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
|
|
|
|
|
|
- coeff.phs_coeff[i][im] =
|
|
|
|
|
|
+ coeff.phs_coeff[i][im][iqcal_idx] =
|
|
|
|
|
|
+ coeff.iqc_coeff[0] & 0x7f;
|
|
|
|
|
|
+ coeff.mag_coeff[i][im][iqcal_idx] =
|
|
|
|
|
|
(coeff.iqc_coeff[0] >> 7) & 0x7f;
|
|
|
|
|
|
|
|
|
|
|
|
- if (coeff.mag_coeff[i][im] > 63)
|
|
|
|
|
|
- coeff.mag_coeff[i][im] -= 128;
|
|
|
|
|
|
- if (coeff.phs_coeff[i][im] > 63)
|
|
|
|
|
|
- coeff.phs_coeff[i][im] -= 128;
|
|
|
|
|
|
+ if (coeff.mag_coeff[i][im][iqcal_idx] > 63)
|
|
|
|
|
|
+ coeff.mag_coeff[i][im][iqcal_idx] -= 128;
|
|
|
|
|
|
+ if (coeff.phs_coeff[i][im][iqcal_idx] > 63)
|
|
|
|
|
|
+ coeff.phs_coeff[i][im][iqcal_idx] -= 128;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
- ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
|
|
|
|
|
|
+
|
|
|
|
|
|
+ if (AR_SREV_9550(ah))
|
|
|
|
|
|
+ outlier_detect = ar955x_tx_iq_cal_median(ah, &coeff,
|
|
|
|
|
|
+ iqcal_idx, nmeasurement);
|
|
|
|
|
|
+ if (outlier_detect)
|
|
|
|
|
|
+ ar9003_hw_tx_iq_cal_outlier_detection(ah, &coeff, is_reusable);
|
|
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1409,7 +1484,7 @@ skip_tx_iqcal:
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (txiqcal_done)
|
|
|
|
|
|
- ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
|
|
|
|
|
|
+ ar9003_hw_tx_iq_cal_post_proc(ah, 0, is_reusable);
|
|
|
|
|
|
else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))
|
|
|
|
|
|
ar9003_hw_tx_iq_cal_reload(ah);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1455,14 +1530,38 @@ skip_tx_iqcal:
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+static bool do_ar9003_agc_cal(struct ath_hw *ah)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
|
+ bool status;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ REG_WRITE(ah, AR_PHY_AGC_CONTROL,
|
|
|
|
|
|
+ REG_READ(ah, AR_PHY_AGC_CONTROL) |
|
|
|
|
|
|
+ AR_PHY_AGC_CONTROL_CAL);
|
|
|
|
|
|
+
|
|
|
|
|
|
+ status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
|
|
|
|
|
|
+ AR_PHY_AGC_CONTROL_CAL,
|
|
|
|
|
|
+ 0, AH_WAIT_TIMEOUT);
|
|
|
|
|
|
+ if (!status) {
|
|
|
|
|
|
+ ath_dbg(common, CALIBRATE,
|
|
|
|
|
|
+ "offset calibration failed to complete in %d ms,"
|
|
|
|
|
|
+ "noisy environment?\n",
|
|
|
|
|
|
+ AH_WAIT_TIMEOUT / 1000);
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
|
|
|
+ return true;
|
|
|
|
|
|
+}
|
|
|
|
|
|
+
|
|
|
|
|
|
static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
|
|
|
|
|
|
struct ath9k_channel *chan)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
|
struct ath9k_hw_cal_data *caldata = ah->caldata;
|
|
|
|
|
|
bool txiqcal_done = false;
|
|
|
|
|
|
- bool is_reusable = true, status = true;
|
|
|
|
|
|
+ bool status = true;
|
|
|
|
|
|
bool run_agc_cal = false, sep_iq_cal = false;
|
|
|
|
|
|
+ int i = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Use chip chainmask only for calibration */
|
|
|
|
|
|
ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
|
|
|
|
|
|
@@ -1485,7 +1584,12 @@ static bool ar9003_hw_init_cal_soc(struc
|
|
|
|
|
|
* AGC calibration. Specifically, AR9550 in SoC chips.
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {
|
|
|
|
|
|
- txiqcal_done = true;
|
|
|
|
|
|
+ if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
|
|
|
|
|
|
+ AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {
|
|
|
|
|
|
+ txiqcal_done = true;
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+ txiqcal_done = false;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
run_agc_cal = true;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
sep_iq_cal = true;
|
|
|
|
|
|
@@ -1512,27 +1616,37 @@ skip_tx_iqcal:
|
|
|
|
|
|
if (AR_SREV_9330_11(ah))
|
|
|
|
|
|
ar9003_hw_manual_peak_cal(ah, 0, IS_CHAN_2GHZ(chan));
|
|
|
|
|
|
|
|
|
|
|
|
- /* Calibrate the AGC */
|
|
|
|
|
|
- REG_WRITE(ah, AR_PHY_AGC_CONTROL,
|
|
|
|
|
|
- REG_READ(ah, AR_PHY_AGC_CONTROL) |
|
|
|
|
|
|
- AR_PHY_AGC_CONTROL_CAL);
|
|
|
|
|
|
-
|
|
|
|
|
|
- /* Poll for offset calibration complete */
|
|
|
|
|
|
- status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
|
|
|
|
|
|
- AR_PHY_AGC_CONTROL_CAL,
|
|
|
|
|
|
- 0, AH_WAIT_TIMEOUT);
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ /*
|
|
|
|
|
|
+ * For non-AR9550 chips, we just trigger AGC calibration
|
|
|
|
|
|
+ * in the HW, poll for completion and then process
|
|
|
|
|
|
+ * the results.
|
|
|
|
|
|
+ *
|
|
|
|
|
|
+ * For AR955x, we run it multiple times and use
|
|
|
|
|
|
+ * median IQ correction.
|
|
|
|
|
|
+ */
|
|
|
|
|
|
+ if (!AR_SREV_9550(ah)) {
|
|
|
|
|
|
+ status = do_ar9003_agc_cal(ah);
|
|
|
|
|
|
+ if (!status)
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
|
|
|
|
|
|
- if (!status) {
|
|
|
|
|
|
- ath_dbg(common, CALIBRATE,
|
|
|
|
|
|
- "offset calibration failed to complete in %d ms; noisy environment?\n",
|
|
|
|
|
|
- AH_WAIT_TIMEOUT / 1000);
|
|
|
|
|
|
- return false;
|
|
|
|
|
|
+ if (txiqcal_done)
|
|
|
|
|
|
+ ar9003_hw_tx_iq_cal_post_proc(ah, 0, false);
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+ if (!txiqcal_done) {
|
|
|
|
|
|
+ status = do_ar9003_agc_cal(ah);
|
|
|
|
|
|
+ if (!status)
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+ for (i = 0; i < MAXIQCAL; i++) {
|
|
|
|
|
|
+ status = do_ar9003_agc_cal(ah);
|
|
|
|
|
|
+ if (!status)
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
+ ar9003_hw_tx_iq_cal_post_proc(ah, i, false);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- if (txiqcal_done)
|
|
|
|
|
|
- ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);
|
|
|
|
|
|
-
|
|
|
|
|
|
/* Revert chainmask to runtime parameters */
|
|
|
|
|
|
ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
|
|
|
|
|
|
|
