aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-08-31 04:29:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-13 15:50:56 -0400
commitcedb5412baeffd7326fc4869aa996d7f68d98ebb (patch)
tree6b5f5c0c034e508b0bff1f7d52cf1aabde5fad3b /net/wireless
parent4690c33df6be8bf78a0d5fe58baae33462b0bc1f (diff)
nl80211/cfg80211: add WIPHY_FLAG_AP_UAPSD flag
add WIPHY_FLAG_AP_UAPSD flag to indicate uapsd support on AP mode. Advertise it to userspace by including a new NL80211_ATTR_SUPPORT_AP_UAPSD attribute. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ad13903c9b89..0cda46ab35e5 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -720,6 +720,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
720 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN); 720 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN);
721 if (dev->wiphy.flags & WIPHY_FLAG_MESH_AUTH) 721 if (dev->wiphy.flags & WIPHY_FLAG_MESH_AUTH)
722 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_MESH_AUTH); 722 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_MESH_AUTH);
723 if (dev->wiphy.flags & WIPHY_FLAG_AP_UAPSD)
724 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_AP_UAPSD);
723 725
724 if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_FW_ROAM) 726 if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_FW_ROAM)
725 NLA_PUT_FLAG(msg, NL80211_ATTR_ROAM_SUPPORT); 727 NLA_PUT_FLAG(msg, NL80211_ATTR_ROAM_SUPPORT);
@@ -2601,7 +2603,8 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
2601 return -EINVAL; 2603 return -EINVAL;
2602 2604
2603 /* parse WME attributes if sta is WME capable */ 2605 /* parse WME attributes if sta is WME capable */
2604 if ((params.sta_flags_set & NL80211_STA_FLAG_WME) && 2606 if ((rdev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) &&
2607 (params.sta_flags_set & NL80211_STA_FLAG_WME) &&
2605 info->attrs[NL80211_ATTR_STA_WME]) { 2608 info->attrs[NL80211_ATTR_STA_WME]) {
2606 struct nlattr *tb[NL80211_STA_WME_MAX + 1]; 2609 struct nlattr *tb[NL80211_STA_WME_MAX + 1];
2607 struct nlattr *nla; 2610 struct nlattr *nla;