diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-14 14:06:28 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 13:01:35 +0100 |
| commit | d6a83228823fc0cc8d79d95c9f0bf568b7317862 (patch) | |
| tree | 322f306f105337ae9e641eb11e16cc01efd83753 /net/mac80211/mesh.c | |
| parent | 8a61af65c6d03781015315dbc43d0942a5b31db9 (diff) | |
| download | kernel_goldelico_gta04-d6a83228823fc0cc8d79d95c9f0bf568b7317862.zip kernel_goldelico_gta04-d6a83228823fc0cc8d79d95c9f0bf568b7317862.tar.gz kernel_goldelico_gta04-d6a83228823fc0cc8d79d95c9f0bf568b7317862.tar.bz2 | |
mac80211: track enable_beacon explicitly
Instead of calculating in ieee80211_bss_info_change_notify()
whether beaconing should be enabled or not, set it in the
correct places in the callers. This simplifies the logic in
this function at the expense of offchannel, but is also more
robust.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index c0008d5..fcfa7ef9 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -626,6 +626,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) sdata->vif.bss_conf.ht_operation_mode = ifmsh->mshcfg.ht_opmode; sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL; + sdata->vif.bss_conf.enable_beacon = true; sdata->vif.bss_conf.basic_rates = ieee80211_mandatory_rates(local, band); @@ -648,6 +649,8 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) /* stop the beacon */ ifmsh->mesh_id_len = 0; + sdata->vif.bss_conf.enable_beacon = false; + clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); /* flush STAs and mpaths on this iface */ |