diff options
| author | Ben Greear <greearb@candelatech.com> | 2018-10-23 13:36:52 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 19:25:24 +0200 |
| commit | dd04b6a121b15d20b88db12210d92175892b09e9 (patch) | |
| tree | 769a9c8c450edd9eb344372322b51fa7af7a47be | |
| parent | d7d6b0cff5cc182eca3fe76e483a9ef2e8bc748b (diff) | |
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.
Change-Id: I7df2ed6b79762f95f29123a1d1296c514d895216
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 2c64ab27b..8baaf8ee7 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -898,6 +898,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, |