diff options
| author | John W. Linville <[email protected]> | 2014-05-22 17:58:36 +0000 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2014-05-22 17:58:36 +0000 |
| commit | 40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 (patch) | |
| tree | a65eb4adca8e37ed7335345e94e36918593f7f92 /net/mac80211/mesh.c | |
| parent | Merge tag 'nfc-next-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | cfg80211: allow RSSI compensation (diff) | |
| download | kernel-40a10fd740a4d5a9f3da255cf8dae48c6723d1a6.tar.gz kernel-40a10fd740a4d5a9f3da255cf8dae48c6723d1a6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
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 b06ddc9519ce..6495a3f0428d 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 = hdr_len + 6; + sdata->csa_counter_offset_beacon[0] = hdr_len + 6; *pos++ = csa->settings.count; *pos++ = WLAN_EID_CHAN_SWITCH_PARAM; *pos++ = 6; |