Commit d9a7ddb0 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: refactor station state transitions 



Station entries can have various states, the most
important ones being auth, assoc and authorized.
This patch prepares us for telling the driver about
these states, we don't want to confuse drivers with
strange transitions, so with this we enforce that
they move in the right order between them (back and
forth); some transitions might happen before the
driver even knows about the station, but at least
runtime transitions will be ordered correctly.

As a consequence, IBSS and MESH stations will now
have the ASSOC flag set (so they can transition to
AUTHORIZED), and we can get rid of a special case
in TX processing.

When freeing a station, unwind the state so that
other parts of the code (or drivers later) can rely
on the transitions.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 87be1e1e

net/mac80211/cfg.c

+61 −15
Original line number Diff line number Diff line
@@ -746,10 +746,11 @@ static void ieee80211_send_layer2_update(struct sta_info *sta) 
	netif_rx_ni(skb);

}



static void sta_apply_parameters(struct ieee80211_local *local,

static int sta_apply_parameters(struct ieee80211_local *local,

				struct sta_info *sta,

				struct station_parameters *params)

{

	int ret = 0;

	u32 rates;

	int i, j;

	struct ieee80211_supported_band *sband;
@@ -761,13 +762,59 @@ static void sta_apply_parameters(struct ieee80211_local *local, 
	mask = params->sta_flags_mask;

	set = params->sta_flags_set;



	/*

	 * In mesh mode, we can clear AUTHENTICATED flag but must

	 * also make ASSOCIATED follow appropriately for the driver

	 * API. See also below, after AUTHORIZED changes.

	 */

	if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {

		/* cfg80211 should not allow this in non-mesh modes */

		if (WARN_ON(!ieee80211_vif_is_mesh(&sdata->vif)))

			return -EINVAL;



		if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&

		    !test_sta_flag(sta, WLAN_STA_AUTH)) {

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_AUTH);

			if (ret)

				return ret;

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_ASSOC);

			if (ret)

				return ret;

		}

	}



	if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {

		if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))

			set_sta_flag(sta, WLAN_STA_AUTHORIZED);

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_AUTHORIZED);

		else

			clear_sta_flag(sta, WLAN_STA_AUTHORIZED);

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_ASSOC);

		if (ret)

			return ret;

	}



	if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {

		/* cfg80211 should not allow this in non-mesh modes */

		if (WARN_ON(!ieee80211_vif_is_mesh(&sdata->vif)))

			return -EINVAL;



		if (!(set & BIT(NL80211_STA_FLAG_AUTHENTICATED)) &&

		    test_sta_flag(sta, WLAN_STA_AUTH)) {

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_AUTH);

			if (ret)

				return ret;

			ret = sta_info_move_state_checked(sta,

					IEEE80211_STA_NONE);

			if (ret)

				return ret;

		}

	}





	if (mask & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) {

		if (set & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE))

			set_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE);
@@ -792,13 +839,6 @@ static void sta_apply_parameters(struct ieee80211_local *local, 
			clear_sta_flag(sta, WLAN_STA_MFP);

	}



	if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {

		if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED))

			set_sta_flag(sta, WLAN_STA_AUTH);

		else

			clear_sta_flag(sta, WLAN_STA_AUTH);

	}



	if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {

		if (set & BIT(NL80211_STA_FLAG_TDLS_PEER))

			set_sta_flag(sta, WLAN_STA_TDLS_PEER);
@@ -870,6 +910,8 @@ static void sta_apply_parameters(struct ieee80211_local *local, 
			}

#endif

	}



	return 0;

}



static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
@@ -900,10 +942,14 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	if (!sta)

		return -ENOMEM;



	set_sta_flag(sta, WLAN_STA_AUTH);

	set_sta_flag(sta, WLAN_STA_ASSOC);

	sta_info_move_state(sta, IEEE80211_STA_AUTH);

	sta_info_move_state(sta, IEEE80211_STA_ASSOC);



	sta_apply_parameters(local, sta, params);

	err = sta_apply_parameters(local, sta, params);

	if (err) {

		sta_info_free(local, sta);

		return err;

	}



	/*

	 * for TDLS, rate control should be initialized only when supported

net/mac80211/ibss.c

+4 −1
Original line number Diff line number Diff line
@@ -512,7 +512,10 @@ struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 
		return NULL;



	sta->last_rx = jiffies;

	set_sta_flag(sta, WLAN_STA_AUTHORIZED);



	sta_info_move_state(sta, IEEE80211_STA_AUTH);

	sta_info_move_state(sta, IEEE80211_STA_ASSOC);

	sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);



	/* make sure mandatory rates are always added */

	sta->sta.supp_rates[band] = supp_rates |

net/mac80211/iface.c

+3 −2
Original line number Diff line number Diff line
@@ -318,8 +318,9 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
			goto err_del_interface;

		}



		/* no atomic bitop required since STA is not live yet */

		set_sta_flag(sta, WLAN_STA_AUTHORIZED);

		sta_info_move_state(sta, IEEE80211_STA_AUTH);

		sta_info_move_state(sta, IEEE80211_STA_ASSOC);

		sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);



		res = sta_info_insert(sta);

		if (res) {

net/mac80211/mesh_plink.c

+5 −2
Original line number Diff line number Diff line
@@ -96,9 +96,12 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata, 
	if (!sta)

		return NULL;



	set_sta_flag(sta, WLAN_STA_AUTH);

	set_sta_flag(sta, WLAN_STA_AUTHORIZED);

	sta_info_move_state(sta, IEEE80211_STA_AUTH);

	sta_info_move_state(sta, IEEE80211_STA_ASSOC);

	sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);



	set_sta_flag(sta, WLAN_STA_WME);



	sta->sta.supp_rates[local->hw.conf.channel->band] = rates;

	if (elems->ht_cap_elem)

		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,

net/mac80211/mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -1577,10 +1577,10 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, 
		return false;

	}



	set_sta_flag(sta, WLAN_STA_AUTH);

	set_sta_flag(sta, WLAN_STA_ASSOC);

	sta_info_move_state(sta, IEEE80211_STA_AUTH);

	sta_info_move_state(sta, IEEE80211_STA_ASSOC);

	if (!(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))

		set_sta_flag(sta, WLAN_STA_AUTHORIZED);

		sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);



	rates = 0;

	basic_rates = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE