diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
commit | ab1f5a532c9d33b49b039660c5ecbc0ab53e7133 (patch) | |
tree | a1c1d820f2280535978632c5935462efcf5a4c7f /net/mac80211/mlme.c | |
parent | f48ecb19bc0443a4272dd0934e7bee4480610df9 (diff) | |
parent | 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9 (diff) | |
download | op-kernel-dev-ab1f5a532c9d33b49b039660c5ecbc0ab53e7133.zip op-kernel-dev-ab1f5a532c9d33b49b039660c5ecbc0ab53e7133.tar.gz |
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 213a420..0d166e7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1117,7 +1117,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, current_band = cbss->channel->band; memset(&csa_ie, 0, sizeof(csa_ie)); - res = ieee80211_parse_ch_switch_ie(sdata, elems, beacon, current_band, + res = ieee80211_parse_ch_switch_ie(sdata, elems, current_band, ifmgd->flags, ifmgd->associated->bssid, &csa_ie); if (res < 0) @@ -1216,7 +1216,8 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, ieee80211_queue_work(&local->hw, &ifmgd->chswitch_work); else mod_timer(&ifmgd->chswitch_timer, - TU_TO_EXP_TIME(csa_ie.count * cbss->beacon_interval)); + TU_TO_EXP_TIME((csa_ie.count - 1) * + cbss->beacon_interval)); } static bool |