diff options
| author |   Michal Kazior <michal.kazior@tieto.com> | 2014-06-05 14:21:36 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2014-06-23 14:22:06 +0200 |
| commit | af296bdb8da4d0a4284de10fc4a61497272ddf11 (patch) | |
| tree | 5387b60fbc8d858402068f2ee69d57104f961e5f /net/mac80211/mesh.c | |
| parent | mac80211: allow tx via monitor iface when DFS (diff) | |
| download | linux-dev-af296bdb8da4d0a4284de10fc4a61497272ddf11.tar.xz linux-dev-af296bdb8da4d0a4284de10fc4a61497272ddf11.zip | |
mac80211: move csa counters from sdata to beacon/presp
Having csa counters part of beacon and probe_resp
structures makes it easier to get rid of possible
races between setting a beacon and updating
counters on SMP systems by guaranteeing counters
are always consistent against given beacon struct.
While at it relax WARN_ON into WARN_ON_ONCE to
prevent spamming logs and racing.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
[remove pointless array check]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index da164685b524..e9f99c1e3fad 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -679,7 +679,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) *pos++ = 0x0; *pos++ = ieee80211_frequency_to_channel( csa->settings.chandef.chan->center_freq); - sdata->csa_counter_offset_beacon[0] = hdr_len + 6; + bcn->csa_counter_offsets[0] = hdr_len + 6; *pos++ = csa->settings.count; *pos++ = WLAN_EID_CHAN_SWITCH_PARAM; *pos++ = 6; |