UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: use csa counter offsets instead of csa_active 

vif->csa_active is protected by mutexes only. This
means it is unreliable to depend on it on codeflow
in non-sleepable beacon and CSA code. There was no
guarantee to have vif->csa_active update be
visible before beacons are updated on SMP systems.

Using csa counter offsets which are embedded in
beacon struct (and thus are protected with single
RCU assignment) is much safer.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Michal Kazior 2014-06-05 14:21:37 +02:00 committed by Johannes Berg
parent af296bdb8d
commit 10d78f2782
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/mac80211/tx.c
View File

@ -2538,6 +2538,9 @@ bool ieee80211_csa_is_complete(struct ieee80211_vif *vif)
goto out; goto out;
} }
if (!beacon->csa_counter_offsets[0])
goto out;
if (WARN_ON_ONCE(beacon->csa_counter_offsets[0] > beacon_data_len)) if (WARN_ON_ONCE(beacon->csa_counter_offsets[0] > beacon_data_len))
goto out; goto out;
@ -2582,7 +2585,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw,
beacon = rcu_dereference(ap->beacon); beacon = rcu_dereference(ap->beacon);
if (beacon) { if (beacon) {
if (sdata->vif.csa_active) { if (beacon->csa_counter_offsets[0]) {
if (!is_template) if (!is_template)
ieee80211_csa_update_counter(vif); ieee80211_csa_update_counter(vif);
@ -2628,7 +2631,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw,
if (!beacon) if (!beacon)
goto out; goto out;
if (sdata->vif.csa_active) { if (beacon->csa_counter_offsets[0]) {
if (!is_template) if (!is_template)
ieee80211_csa_update_counter(vif); ieee80211_csa_update_counter(vif);
@ -2653,7 +2656,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw,
if (!beacon) if (!beacon)
goto out; goto out;
if (sdata->vif.csa_active) { if (beacon->csa_counter_offsets[0]) {
if (!is_template) if (!is_template)
/* TODO: For mesh csa_counter is in TU, so /* TODO: For mesh csa_counter is in TU, so
* decrementing it by one isn't correct, but * decrementing it by one isn't correct, but