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

mac80211: split ieee80211_sta_def_wmm_params 



Cleans up the code a bit and prepares for the next patch
that will use the function elsewhere.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ef422bc0

net/mac80211/mlme.c

+27 −21
Original line number Diff line number Diff line
@@ -539,27 +539,14 @@ static void ieee80211_send_refuse_measurement_request(struct ieee80211_sub_if_da 
}



/* MLME */

static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,

					 struct ieee80211_sta_bss *bss)

static void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_local *local = sdata->local;

	int i, have_higher_than_11mbit = 0;





	/* cf. IEEE 802.11 9.2.12 */

	for (i = 0; i < bss->supp_rates_len; i++)

		if ((bss->supp_rates[i] & 0x7f) * 5 > 110)

			have_higher_than_11mbit = 1;



	if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&

	    have_higher_than_11mbit)

		sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;

	else

		sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;





	if (local->ops->conf_tx) {

	struct ieee80211_tx_queue_params qparam;

	int i;



	if (!local->ops->conf_tx)

		return;



	memset(&qparam, 0, sizeof(qparam));
@@ -577,6 +564,25 @@ static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, 
	for (i = 0; i < local_to_hw(local)->queues; i++)

		local->ops->conf_tx(local_to_hw(local), i, &qparam);

}



static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,

					 struct ieee80211_sta_bss *bss)

{

	struct ieee80211_local *local = sdata->local;

	int i, have_higher_than_11mbit = 0;



	/* cf. IEEE 802.11 9.2.12 */

	for (i = 0; i < bss->supp_rates_len; i++)

		if ((bss->supp_rates[i] & 0x7f) * 5 > 110)

			have_higher_than_11mbit = 1;



	if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&

	    have_higher_than_11mbit)

		sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;

	else

		sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;



	ieee80211_set_wmm_default(sdata);

}



static void ieee80211_sta_wmm_params(struct ieee80211_local *local,