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

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

mac80211: require four hardware queues for QoS/HT 



This patch makes mac80211 only announce QoS/HT support when
the underlying hardware has four (or more) queues.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Ron Rindjunksi <ron.rindjunksi@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ca21614d

net/mac80211/iface.c

+2 −1
Original line number Diff line number Diff line
@@ -157,9 +157,10 @@ void ieee80211_if_set_type(struct net_device *dev, int type) 
		ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN |

			IEEE80211_AUTH_ALG_SHARED_KEY;

		ifsta->flags |= IEEE80211_STA_CREATE_IBSS |

			IEEE80211_STA_WMM_ENABLED |

			IEEE80211_STA_AUTO_BSSID_SEL |

			IEEE80211_STA_AUTO_CHANNEL_SEL;

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

			ifsta->flags |= IEEE80211_STA_WMM_ENABLED;



		msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);

		sdata->bss = &msdata->u.ap;

net/mac80211/mlme.c

+14 −7
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static void ieee80211_sta_wmm_params(struct net_device *dev, 
	int count;

	u8 *pos;



	if (!(ifsta->flags & IEEE80211_STA_WMM_ENABLED))

		return;



	if (!wmm_param)

		return;



	if (wmm_param_len < 8 || wmm_param[5] /* version */ != 1)

		return;

	count = wmm_param[6] & 0x0f;
@@ -763,8 +769,10 @@ static void ieee80211_send_assoc(struct net_device *dev, 
		*pos++ = 1; /* WME ver */

		*pos++ = 0;

	}



	/* wmm support is a must to HT */

	if (wmm && sband->ht_info.ht_supported) {

	if (wmm && (ifsta->flags & IEEE80211_STA_WMM_ENABLED) &&

	    sband->ht_info.ht_supported) {

		__le16 tmp = cpu_to_le16(sband->ht_info.cap);

		pos = skb_put(skb, sizeof(struct ieee80211_ht_cap)+2);

		*pos++ = WLAN_EID_HT_CAPABILITY;
@@ -2021,7 +2029,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
	else

		sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;



	if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param) {

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

	    (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {

		struct ieee80211_ht_bss_info bss_info;

		ieee80211_ht_cap_ie_to_ht_info(

				(struct ieee80211_ht_cap *)
@@ -2034,7 +2043,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 


	rate_control_rate_init(sta, local);



	if (elems.wmm_param && (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {

	if (elems.wmm_param) {

		sta->flags |= WLAN_STA_WME;

		rcu_read_unlock();

		ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,
@@ -2817,10 +2826,8 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev, 


	ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);



	if (elems.wmm_param && (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {

	ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,

				 elems.wmm_param_len);

	}



	/* Do not send changes to driver if we are scanning. This removes

	 * requirement that driver's bss_info_changed function needs to be

net/mac80211/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -1490,8 +1490,8 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, 
		rcu_read_unlock();

	}



	/* receiver is QoS enabled, use a QoS type frame */

	if (sta_flags & WLAN_STA_WME) {

	/* receiver and we are QoS enabled, use a QoS type frame */

	if (sta_flags & WLAN_STA_WME && local->hw.queues >= 4) {

		fc |= IEEE80211_STYPE_QOS_DATA;

		hdrlen += 2;

	}