1 files changed, 104 insertions, 5 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b85075761e24..edf655aeea00 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -192,6 +192,11 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_ROAM_SUPPORT] = { .type = NLA_FLAG },
         [NL80211_ATTR_SCHED_SCAN_MATCH] = { .type = NLA_NESTED },
         [NL80211_ATTR_TX_NO_CCK_RATE] = { .type = NLA_FLAG },
+        [NL80211_ATTR_TDLS_ACTION] = { .type = NLA_U8 },
+        [NL80211_ATTR_TDLS_DIALOG_TOKEN] = { .type = NLA_U8 },
+        [NL80211_ATTR_TDLS_OPERATION] = { .type = NLA_U8 },
+        [NL80211_ATTR_TDLS_SUPPORT] = { .type = NLA_FLAG },
+        [NL80211_ATTR_TDLS_EXTERNAL_SETUP] = { .type = NLA_FLAG },
 };
 
 /* policy for the key attributes */
@@ -732,9 +737,12 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                 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);
+        if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS)
+                NLA_PUT_FLAG(msg, NL80211_ATTR_TDLS_SUPPORT);
+        if (dev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP)
+                NLA_PUT_FLAG(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP);
 
         NLA_PUT(msg, NL80211_ATTR_CIPHER_SUITES,
                 sizeof(u32) * dev->wiphy.n_cipher_suites,
@@ -877,6 +885,10 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
         }
         CMD(set_channel, SET_CHANNEL);
         CMD(set_wds_peer, SET_WDS_PEER);
+        if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) {
+                CMD(tdls_mgmt, TDLS_MGMT);
+                CMD(tdls_oper, TDLS_OPER);
+        }
         if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)
                 CMD(sched_scan_start, START_SCHED_SCAN);
 
@@ -2518,18 +2530,25 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 break;
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_STATION:
-                /* disallow everything but AUTHORIZED flag */
+                /* disallow things sta doesn't support */
                 if (params.plink_action)
                         err = -EINVAL;
                 if (params.vlan)
                         err = -EINVAL;
-                if (params.supported_rates)
+                if (params.supported_rates &&
+                    !(params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)))
                         err = -EINVAL;
                 if (params.ht_capa)
                         err = -EINVAL;
                 if (params.listen_interval >= 0)
                         err = -EINVAL;
-                if (params.sta_flags_mask & ~BIT(NL80211_STA_FLAG_AUTHORIZED))
+                if (params.sta_flags_mask &
+                                ~(BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                                  BIT(NL80211_STA_FLAG_TDLS_PEER)))
+                        err = -EINVAL;
+                /* can't change the TDLS bit */
+                if (!(params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) &&
+                    (params.sta_flags_mask & BIT(NL80211_STA_FLAG_TDLS_PEER)))
                         err = -EINVAL;
                 break;
         case NL80211_IFTYPE_MESH_POINT:
@@ -2643,12 +2662,25 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
 
                 if (params.max_sp & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)
                         return -EINVAL;
+
+                params.sta_modify_mask |= STATION_PARAM_APPLY_UAPSD;
         }
 
         if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
             dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
             dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT &&
-            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO &&
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION)
+                return -EINVAL;
+
+        /*
+         * Only managed stations can add TDLS peers, and only when the
+         * wiphy supports external TDLS setup.
+         */
+        if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION &&
+            !((params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) &&
+              (rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) &&
+              (rdev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP)))
                 return -EINVAL;
 
         err = get_vlan(info, rdev, &params.vlan);
@@ -4964,6 +4996,57 @@ static int nl80211_flush_pmksa(struct sk_buff *skb, struct genl_info *info)
         return rdev->ops->flush_pmksa(&rdev->wiphy, dev);
 }
 
+static int nl80211_tdls_mgmt(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *rdev = info->user_ptr[0];
+        struct net_device *dev = info->user_ptr[1];
+        u8 action_code, dialog_token;
+        u16 status_code;
+        u8 *peer;
+
+        if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) ||
+            !rdev->ops->tdls_mgmt)
+                return -EOPNOTSUPP;
+
+        if (!info->attrs[NL80211_ATTR_TDLS_ACTION] ||
+            !info->attrs[NL80211_ATTR_STATUS_CODE] ||
+            !info->attrs[NL80211_ATTR_TDLS_DIALOG_TOKEN] ||
+            !info->attrs[NL80211_ATTR_IE] ||
+            !info->attrs[NL80211_ATTR_MAC])
+                return -EINVAL;
+
+        peer = nla_data(info->attrs[NL80211_ATTR_MAC]);
+        action_code = nla_get_u8(info->attrs[NL80211_ATTR_TDLS_ACTION]);
+        status_code = nla_get_u16(info->attrs[NL80211_ATTR_STATUS_CODE]);
+        dialog_token = nla_get_u8(info->attrs[NL80211_ATTR_TDLS_DIALOG_TOKEN]);
+
+        return rdev->ops->tdls_mgmt(&rdev->wiphy, dev, peer, action_code,
+                                    dialog_token, status_code,
+                                    nla_data(info->attrs[NL80211_ATTR_IE]),
+                                    nla_len(info->attrs[NL80211_ATTR_IE]));
+}
+
+static int nl80211_tdls_oper(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg80211_registered_device *rdev = info->user_ptr[0];
+        struct net_device *dev = info->user_ptr[1];
+        enum nl80211_tdls_operation operation;
+        u8 *peer;
+
+        if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) ||
+            !rdev->ops->tdls_oper)
+                return -EOPNOTSUPP;
+
+        if (!info->attrs[NL80211_ATTR_TDLS_OPERATION] ||
+            !info->attrs[NL80211_ATTR_MAC])
+                return -EINVAL;
+
+        operation = nla_get_u8(info->attrs[NL80211_ATTR_TDLS_OPERATION]);
+        peer = nla_data(info->attrs[NL80211_ATTR_MAC]);
+
+        return rdev->ops->tdls_oper(&rdev->wiphy, dev, peer, operation);
+}
+
 static int nl80211_remain_on_channel(struct sk_buff *skb,
                                      struct genl_info *info)
 {
@@ -6279,6 +6362,22 @@ static struct genl_ops nl80211_ops[] = {
                 .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
                                   NL80211_FLAG_NEED_RTNL,
         },
+        {
+                .cmd = NL80211_CMD_TDLS_MGMT,
+                .doit = nl80211_tdls_mgmt,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+                .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+                                  NL80211_FLAG_NEED_RTNL,
+        },
+        {
+                .cmd = NL80211_CMD_TDLS_OPER,
+                .doit = nl80211_tdls_oper,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+                .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+                                  NL80211_FLAG_NEED_RTNL,
+        },
 };
 
 static struct genl_multicast_group nl80211_mlme_mcgrp = {