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>

3 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index f2d75e3ceb43..387e6e220502 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1044,6 +1044,8 @@ enum nl80211_commands {
  *
  * @NL80211_ATTR_STA_WME: Nested attribute containing the wme configuration
  *      of the station, see &enum nl80211_sta_wme_attr.
+ * @NL80211_ATTR_SUPPORT_AP_UAPSD: the device supports uapsd when working
+ *      as AP.
  *
  * @NL80211_ATTR_ROAM_SUPPORT: Indicates whether the firmware is capable of
  *      roaming to another AP in the same ESS if the signal lever is low.
@@ -1259,6 +1261,7 @@ enum nl80211_attrs {
         NL80211_ATTR_IE_ASSOC_RESP,
 
         NL80211_ATTR_STA_WME,
+        NL80211_ATTR_SUPPORT_AP_UAPSD,
 
         NL80211_ATTR_ROAM_SUPPORT,
 
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 53609dec2c9f..01c6bde99a41 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1621,6 +1621,7 @@ struct cfg80211_ops {
  * @WIPHY_FLAG_SUPPORTS_SCHED_SCAN: The device supports scheduled scans.
  * @WIPHY_FLAG_SUPPORTS_FW_ROAM: The device supports roaming feature in the
  *      firmware.
+ * @WIPHY_FLAG_AP_UAPSD: The device supports uapsd on AP.
  */
 enum wiphy_flags {
         WIPHY_FLAG_CUSTOM_REGULATORY            = BIT(0),
@@ -1636,6 +1637,7 @@ enum wiphy_flags {
         WIPHY_FLAG_SUPPORTS_SCHED_SCAN          = BIT(11),
         WIPHY_FLAG_ENFORCE_COMBINATIONS         = BIT(12),
         WIPHY_FLAG_SUPPORTS_FW_ROAM             = BIT(13),
+        WIPHY_FLAG_AP_UAPSD                     = BIT(14),
 };
 
 /**
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,
                 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN);
         if (dev->wiphy.flags & WIPHY_FLAG_MESH_AUTH)
                 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_MESH_AUTH);
+        if (dev->wiphy.flags & WIPHY_FLAG_AP_UAPSD)
+                NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_AP_UAPSD);
 
         if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_FW_ROAM)
                 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)
                 return -EINVAL;
 
         /* parse WME attributes if sta is WME capable */
-        if ((params.sta_flags_set & NL80211_STA_FLAG_WME) &&
+        if ((rdev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) &&
+            (params.sta_flags_set & NL80211_STA_FLAG_WME) &&
             info->attrs[NL80211_ATTR_STA_WME]) {
                 struct nlattr *tb[NL80211_STA_WME_MAX + 1];
                 struct nlattr *nla;