Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mac80211: combine QoS with other BSS changes 



When associating and particularly when disassociating
there's no need to notify the driver about changes
with multiple calls to bss_info_changed, we should
combine the QoS enabling/disabling into the same call
as otherwise the driver could get confused about QoS
suddenly getting disabled while connected.

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

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -1348,7 +1348,8 @@ int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, 
void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp);

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata);

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,

			       bool bss_notify);

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);



void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,

net/mac80211/iface.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
		 * need to initialise the hardware if the hardware

		 * doesn't start up with sane defaults

		 */

		ieee80211_set_wmm_default(sdata);

		ieee80211_set_wmm_default(sdata, true);

	}



	set_bit(SDATA_STATE_RUNNING, &sdata->state);

net/mac80211/mlme.c

+8 −4
Original line number Diff line number Diff line
@@ -1277,7 +1277,6 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local, 


	/* enable WMM or activate new settings */

	sdata->vif.bss_conf.qos = true;

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);

}



static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
@@ -1455,8 +1454,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	changed |= BSS_CHANGED_ASSOC;

	sdata->vif.bss_conf.assoc = false;



	ieee80211_set_wmm_default(sdata);



	/* channel(_type) changes are handled by ieee80211_hw_config */

	WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
@@ -1484,10 +1481,16 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
		changed |= BSS_CHANGED_ARP_FILTER;

	}



	sdata->vif.bss_conf.qos = false;

	changed |= BSS_CHANGED_QOS;



	/* The BSSID (not really interesting) and HT changed */

	changed |= BSS_CHANGED_BSSID | BSS_CHANGED_HT;

	ieee80211_bss_info_change_notify(sdata, changed);



	/* disassociated - set to defaults now */

	ieee80211_set_wmm_default(sdata, false);



	del_timer_sync(&sdata->u.mgd.conn_mon_timer);

	del_timer_sync(&sdata->u.mgd.bcn_mon_timer);

	del_timer_sync(&sdata->u.mgd.timer);
@@ -2155,7 +2158,8 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
		ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,

					 elems.wmm_param_len);

	else

		ieee80211_set_wmm_default(sdata);

		ieee80211_set_wmm_default(sdata, false);

	changed |= BSS_CHANGED_QOS;



	if (elems.ht_info_elem && elems.wmm_param &&

	    (sdata->local->hw.queues >= 4) &&

net/mac80211/util.c

+6 −3
Original line number Diff line number Diff line
@@ -737,7 +737,8 @@ void ieee802_11_parse_elems(u8 *start, size_t len, 
	ieee802_11_parse_elems_crc(start, len, elems, 0, 0);

}



void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,

			       bool bss_notify)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_tx_queue_params qparam;
@@ -807,7 +808,9 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata) 
	if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {

		sdata->vif.bss_conf.qos =

			sdata->vif.type != NL80211_IFTYPE_STATION;

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);

		if (bss_notify)

			ieee80211_bss_info_change_notify(sdata,

							 BSS_CHANGED_QOS);

	}

}
@@ -829,7 +832,7 @@ void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, 
	else

		sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;



	ieee80211_set_wmm_default(sdata);

	ieee80211_set_wmm_default(sdata, true);

}



u32 ieee80211_mandatory_rates(struct ieee80211_local *local,