Skip to contentSkip to conversation

compat-wireless: UAPSD configuration in STA mode

RFC In review Dmitry Tarnyagin 3 participants 3 messages Oct 12, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC 6/7 compat-wireless: UAPSD configuration in STA mode

From: Janusz Dziedzic <[email protected]>
Date: Wed, 3 Aug 2011 09:46:05 +0200

This patch adds UAPSD queues configuration as a param to assoc request. With the patch it's possible to configure UAPSD from user space.

---
 include/linux/nl80211.h |    2 ++
 include/net/cfg80211.h  |    1 +
 net/mac80211/main.c     |    3 ++-
 net/mac80211/mlme.c     |    2 ++
 net/wireless/core.h     |    6 ++++--
 net/wireless/mlme.c     |   10 +++++++---
 net/wireless/nl80211.c  |    7 ++++++-
 net/wireless/sme.c      |    2 +-
 8 files changed, 25 insertions(+), 8 deletions(-)
include/linux/nl80211.h +2 -0
index a9bee60..74c5458 100644
@@ -1349,6 +1349,8 @@ enum nl80211_attrs {
 	NL80211_ATTR_P2P_PS_LEGACY_PS,
 	NL80211_ATTR_P2P_PS_OPP_PS,
 	NL80211_ATTR_P2P_PS_CTWINDOW,
+	NL80211_ATTR_UAPSD,
+
 	/* add attributes here, update the policy in nl80211.c */
 
 	__NL80211_ATTR_AFTER_LAST,
include/net/cfg80211.h +1 -0
index c08e475..228194f 100644
@@ -1050,6 +1050,7 @@ struct cfg80211_assoc_request {
 	size_t ie_len;
 	struct cfg80211_crypto_settings crypto;
 	bool use_mfp;
+	int uapsd;
 };
 
 /**
net/mac80211/main.c +2 -1
index b9b9765..5f99907 100644
@@ -630,7 +630,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 	local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
 	local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
 	local->user_power_level = -1;
-	local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
+	/* Disable all UAPSD AC by default */
+	local->uapsd_queues = 0;
 	local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
 
 	INIT_LIST_HEAD(&local->interfaces);
net/mac80211/mlme.c +2 -0
index dde286a..5116ee1 100644
@@ -2754,6 +2754,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 
 	if (bss->wmm_used && bss->uapsd_supported &&
 	    (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)) {
+		if (req->uapsd != -1)
+			sdata->local->uapsd_queues = req->uapsd;
 		wk->assoc.uapsd_used = true;
 		ifmgd->flags |= IEEE80211_STA_UAPSD_ENABLED;
 	} else {
net/wireless/core.h +4 -2
index b9ec306..71763ae 100644
@@ -339,13 +339,15 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
 			  const u8 *bssid, const u8 *prev_bssid,
 			  const u8 *ssid, int ssid_len,
 			  const u8 *ie, int ie_len, bool use_mfp,
-			  struct cfg80211_crypto_settings *crypt);
+			  struct cfg80211_crypto_settings *crypt,
+			  int uapsd);
 int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
 			struct net_device *dev, struct ieee80211_channel *chan,
 			const u8 *bssid, const u8 *prev_bssid,
 			const u8 *ssid, int ssid_len,
 			const u8 *ie, int ie_len, bool use_mfp,
-			struct cfg80211_crypto_settings *crypt);
+			struct cfg80211_crypto_settings *crypt,
+			int uapsd);
 int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev,
 			   struct net_device *dev, const u8 *bssid,
 			   const u8 *ie, int ie_len, u16 reason,
net/wireless/mlme.c +7 -3
index 4194b3e..3a03fd2 100644
@@ -507,7 +507,8 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
 			  const u8 *bssid, const u8 *prev_bssid,
 			  const u8 *ssid, int ssid_len,
 			  const u8 *ie, int ie_len, bool use_mfp,
-			  struct cfg80211_crypto_settings *crypt)
+			  struct cfg80211_crypto_settings *crypt,
+			  int uapsd)
 {
 	struct wireless_dev *wdev = dev->ieee80211_ptr;
 	struct cfg80211_assoc_request req;
@@ -537,6 +538,7 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
 	memcpy(&req.crypto, crypt, sizeof(req.crypto));
 	req.use_mfp = use_mfp;
 	req.prev_bssid = prev_bssid;
+	req.uapsd = uapsd;
 	req.bss = cfg80211_get_bss(&rdev->wiphy, chan, bssid, ssid, ssid_len,
 				   WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
 	if (!req.bss) {
@@ -574,14 +576,16 @@ int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
 			const u8 *bssid, const u8 *prev_bssid,
 			const u8 *ssid, int ssid_len,
 			const u8 *ie, int ie_len, bool use_mfp,
-			struct cfg80211_crypto_settings *crypt)
+			struct cfg80211_crypto_settings *crypt,
+			int uapsd)
 {
 	struct wireless_dev *wdev = dev->ieee80211_ptr;
 	int err;
 
 	wdev_lock(wdev);
 	err = __cfg80211_mlme_assoc(rdev, dev, chan, bssid, prev_bssid,
-				    ssid, ssid_len, ie, ie_len, use_mfp, crypt);
+				    ssid, ssid_len, ie, ie_len, use_mfp,
+				    crypt, uapsd);
 	wdev_unlock(wdev);
 
 	return err;
net/wireless/nl80211.c +6 -1
index 683f56e..0e5c8a8 100644
@@ -206,6 +206,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
 	[NL80211_ATTR_P2P_PS_LEGACY_PS] = { .type = NLA_U32 },
 	[NL80211_ATTR_P2P_PS_OPP_PS] = { .type = NLA_U32 },
 	[NL80211_ATTR_P2P_PS_CTWINDOW] = { .type = NLA_U32 },
+	[NL80211_ATTR_UAPSD] = { .type = NLA_U32 },
 };
 
 /* policy for the key attributes */
@@ -4362,6 +4363,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
 	const u8 *bssid, *ssid, *ie = NULL, *prev_bssid = NULL;
 	int err, ssid_len, ie_len = 0;
 	bool use_mfp = false;
+	int uapsd = -1;
 
 	if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))
 		return -EINVAL;
@@ -4405,11 +4407,14 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
 	if (info->attrs[NL80211_ATTR_PREV_BSSID])
 		prev_bssid = nla_data(info->attrs[NL80211_ATTR_PREV_BSSID]);
 
+	if (info->attrs[NL80211_ATTR_UAPSD])
+		uapsd = nla_get_u32(info->attrs[NL80211_ATTR_UAPSD]);
+
 	err = nl80211_crypto_settings(rdev, info, &crypto, 1);
 	if (!err)
 		err = cfg80211_mlme_assoc(rdev, dev, chan, bssid, prev_bssid,
 					  ssid, ssid_len, ie, ie_len, use_mfp,
-					  &crypto);
+					  &crypto, uapsd);
 
 	return err;
 }
net/wireless/sme.c +1 -1
index 0acfdc9..daef93c 100644
@@ -190,7 +190,7 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
 					    prev_bssid,
 					    params->ssid, params->ssid_len,
 					    params->ie, params->ie_len,
-					    false, &params->crypto);
+					    false, &params->crypto, -1);
 		if (err)
 			__cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
 					       NULL, 0,
Signature · 1 line
1.7.1
#1 lore raw

Hi Dmitry,

Some minor comments on this patch:

Note that I'm not a maintainer and that these are comments on the patch itself, not the code it adds.

Again, this is marked as a compat-wireless patch, but you're modifying files that aren't in compat-wireless. Are you sure this patch is correct?

Thanks,

Signature · 5 lines
Julian Calaby

Email: [email protected]
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
maintainer
#2 lore raw
In reply to Dmitry Tarnyagin
Quoted 7 lines · Dmitry Tarnyagin

From: Janusz Dziedzic <[email protected]>
Date: Wed, 3 Aug 2011 09:46:05 +0200

This patch adds UAPSD queues configuration as a param to assoc request. With the patch it's possible to configure UAPSD from user space.

Quoted 10 lines
---
  include/linux/nl80211.h |    2 ++
  include/net/cfg80211.h  |    1 +
  net/mac80211/main.c     |    3 ++-
  net/mac80211/mlme.c     |    2 ++
  net/wireless/core.h     |    6 ++++--
  net/wireless/mlme.c     |   10 +++++++---
  net/wireless/nl80211.c  |    7 ++++++-
  net/wireless/sme.c      |    2 +-
  8 files changed, 25 insertions(+), 8 deletions(-)

This is a rare case where *maybe* it's OK to do both mac80211 and cfg80211 in one patch, but I haven't seen much evidence from all of you that you really understand the separation, so I'd prefer if you split it up and explained the changes separately.

include/net/cfg80211.h struct cfg80211_assoc_request { · line 1053

Quoted 6 lines

+++ b/include/net/cfg80211.h

include/net/cfg80211.h +1 -0
@@ -1050,6 +1050,7 @@ struct cfg80211_assoc_request {
  	size_t ie_len;
  	struct cfg80211_crypto_settings crypto;
  	bool use_mfp;
+	int uapsd;

int? explain. also you're obviously missing documentation that would have explained this.

net/mac80211/main.c struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, · line 634

Quoted 3 lines
net/mac80211/main.c +2 -1
-	local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
+	/* Disable all UAPSD AC by default */
+	local->uapsd_queues = 0;

You should obviously then remove the default constant, or better yet just set it to 0. Also _that_ specific change needs to be a separate change since it modifies existing behaviour.

net/wireless/nl80211.c static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) · line 4411

Quoted 2 lines
net/wireless/nl80211.c +2 -0
+	if (info->attrs[NL80211_ATTR_UAPSD])
+		uapsd = nla_get_u32(info->attrs[NL80211_ATTR_UAPSD]);

clearly missing validation.

Quoted 11 lines

+++ b/net/wireless/sme.c

net/wireless/sme.c +1 -1
@@ -190,7 +190,7 @@ static int cfg80211_conn_do_work(struct wireless_dev  
 *wdev)
  					    prev_bssid,
  					    params->ssid, params->ssid_len,
  					    params->ie, params->ie_len,
-					    false, &params->crypto);
+					    false, &params->crypto, -1);
  		if (err)
  			__cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,

NULL, 0,

Really? Why should this not be able to do uapsd with the same way?

johannes