diff options
| author | Ben Greear <greearb@candelatech.com> | 2018-10-23 23:36:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-13 11:22:32 +0300 |
| commit | 302846379cba7766bf4c1bcf0cebd3aa52004fc5 (patch) | |
| tree | c0edaf6485fc56b0dd9bda6578934c5db6f60ad7 /net/mac80211 | |
| parent | e0e93c095ff1580dd472972f6164943b64d08354 (diff) | |
| download | linux-302846379cba7766bf4c1bcf0cebd3aa52004fc5.tar.xz | |
mac80211: Clear beacon_int in ieee80211_do_stop
commit 5c21e8100dfd57c806e833ae905e26efbb87840f upstream.
This fixes stale beacon-int values that would keep a netdev
from going up.
To reproduce:
Create two VAP on one radio.
vap1 has beacon-int 100, start it.
vap2 has beacon-int 240, start it (and it will fail
because beacon-int mismatch).
reconfigure vap2 to have beacon-int 100 and start it.
It will fail because the stale beacon-int 240 will be used
in the ifup path and hostapd never gets a chance to set the
new beacon interval.
Cc: stable@vger.kernel.org
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 672e28918a44..f4ce34670fa8 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -958,6 +958,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, if (local->open_count == 0) ieee80211_clear_tx_pending(local); + sdata->vif.bss_conf.beacon_int = 0; + /* * If the interface goes down while suspended, presumably because * the device was unplugged and that happens before our resume, |