Commit d6a83228 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8a61af65

net/mac80211/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -930,6 +930,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 


	sdata->vif.bss_conf.beacon_int = params->beacon_interval;

	sdata->vif.bss_conf.dtim_period = params->dtim_period;

	sdata->vif.bss_conf.enable_beacon = true;



	sdata->vif.bss_conf.ssid_len = params->ssid_len;

	if (params->ssid_len)
@@ -1017,6 +1018,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
		sta_info_flush_cleanup(vlan);

	sta_info_flush_cleanup(sdata);



	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);



	drv_stop_ap(sdata->local, sdata);

net/mac80211/ibss.c

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 


	rcu_assign_pointer(ifibss->presp, skb);



	sdata->vif.bss_conf.enable_beacon = true;

	sdata->vif.bss_conf.beacon_int = beacon_int;

	sdata->vif.bss_conf.basic_rates = basic_rates;

	bss_change = BSS_CHANGED_BEACON_INT;
@@ -1189,6 +1190,8 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) 
	RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);

	sdata->vif.bss_conf.ibss_joined = false;

	sdata->vif.bss_conf.ibss_creator = false;

	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 |

						BSS_CHANGED_IBSS);

	synchronize_rcu();

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -659,10 +659,13 @@ enum ieee80211_sub_if_data_flags { 
 *	change handling while the interface is up

 * @SDATA_STATE_OFFCHANNEL: This interface is currently in offchannel

 *	mode, so queues are stopped

 * @SDATA_STATE_OFFCHANNEL_BEACON_STOPPED: Beaconing was stopped due

 *	to offchannel, reset when offchannel returns

 */

enum ieee80211_sdata_state_bits {

	SDATA_STATE_RUNNING,

	SDATA_STATE_OFFCHANNEL,

	SDATA_STATE_OFFCHANNEL_BEACON_STOPPED,

};



/**

net/mac80211/main.c

+0 −32
Original line number Diff line number Diff line
@@ -245,38 +245,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, 
		break;

	}



	if (changed & BSS_CHANGED_BEACON_ENABLED) {

		if (local->quiescing || !ieee80211_sdata_running(sdata) ||

		    test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) {

			sdata->vif.bss_conf.enable_beacon = false;

		} else {

			/*

			 * Beacon should be enabled, but AP mode must

			 * check whether there is a beacon configured.

			 */

			switch (sdata->vif.type) {

			case NL80211_IFTYPE_AP:

				sdata->vif.bss_conf.enable_beacon =

					!!sdata->u.ap.beacon;

				break;

			case NL80211_IFTYPE_ADHOC:

				sdata->vif.bss_conf.enable_beacon =

					!!sdata->u.ibss.presp;

				break;

#ifdef CONFIG_MAC80211_MESH

			case NL80211_IFTYPE_MESH_POINT:

				sdata->vif.bss_conf.enable_beacon =

					!!sdata->u.mesh.mesh_id_len;

				break;

#endif

			default:

				/* not reached */

				WARN_ON(1);

				break;

			}

		}

	}



	drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);

}

net/mac80211/mesh.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE