Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 106 insertions, 23 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 206465dc0cab..7ae54b82291f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -921,7 +921,12 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                 if (nla_put_u32(msg, i, NL80211_CMD_SET_WIPHY_NETNS))
                         goto nla_put_failure;
         }
-        CMD(set_channel, SET_CHANNEL);
+        if (dev->ops->set_monitor_channel || dev->ops->start_ap ||
+            dev->ops->join_mesh) {
+                i++;
+                if (nla_put_u32(msg, i, NL80211_CMD_SET_CHANNEL))
+                        goto nla_put_failure;
+        }
         CMD(set_wds_peer, SET_WDS_PEER);
         if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) {
                 CMD(tdls_mgmt, TDLS_MGMT);
@@ -1162,18 +1167,22 @@ static int parse_txq_params(struct nlattr *tb[],
 static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev)
 {
         /*
-         * You can only set the channel explicitly for AP, mesh
-         * and WDS type interfaces; all others have their channel
-         * managed via their respective "establish a connection"
-         * command (connect, join, ...)
+         * You can only set the channel explicitly for WDS interfaces,
+         * all others have their channel managed via their respective
+         * "establish a connection" command (connect, join, ...)
+         *
+         * For AP/GO and mesh mode, the channel can be set with the
+         * channel userspace API, but is only stored and passed to the
+         * low-level driver when the AP starts or the mesh is joined.
+         * This is for backward compatibility, userspace can also give
+         * the channel in the start-ap or join-mesh commands instead.
          *
          * Monitors are special as they are normally slaved to
-         * whatever else is going on, so they behave as though
-         * you tried setting the wiphy channel itself.
+         * whatever else is going on, so they have their own special
+         * operation to set the monitor channel if possible.
          */
         return !wdev ||
                 wdev->iftype == NL80211_IFTYPE_AP ||
-                wdev->iftype == NL80211_IFTYPE_WDS ||
                 wdev->iftype == NL80211_IFTYPE_MESH_POINT ||
                 wdev->iftype == NL80211_IFTYPE_MONITOR ||
                 wdev->iftype == NL80211_IFTYPE_P2P_GO;
@@ -1204,9 +1213,14 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
                                  struct wireless_dev *wdev,
                                  struct genl_info *info)
 {
+        struct ieee80211_channel *channel;
         enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
         u32 freq;
         int result;
+        enum nl80211_iftype iftype = NL80211_IFTYPE_MONITOR;
+
+        if (wdev)
+                iftype = wdev->iftype;
 
         if (!info->attrs[NL80211_ATTR_WIPHY_FREQ])
                 return -EINVAL;
@@ -1221,12 +1235,32 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
         freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
 
         mutex_lock(&rdev->devlist_mtx);
-        if (wdev) {
-                wdev_lock(wdev);
-                result = cfg80211_set_freq(rdev, wdev, freq, channel_type);
-                wdev_unlock(wdev);
-        } else {
-                result = cfg80211_set_freq(rdev, NULL, freq, channel_type);
+        switch (iftype) {
+        case NL80211_IFTYPE_AP:
+        case NL80211_IFTYPE_P2P_GO:
+                if (wdev->beacon_interval) {
+                        result = -EBUSY;
+                        break;
+                }
+                channel = rdev_freq_to_chan(rdev, freq, channel_type);
+                if (!channel || !cfg80211_can_beacon_sec_chan(&rdev->wiphy,
+                                                              channel,
+                                                              channel_type)) {
+                        result = -EINVAL;
+                        break;
+                }
+                wdev->preset_chan = channel;
+                wdev->preset_chantype = channel_type;
+                result = 0;
+                break;
+        case NL80211_IFTYPE_MESH_POINT:
+                result = cfg80211_set_mesh_freq(rdev, wdev, freq, channel_type);
+                break;
+        case NL80211_IFTYPE_MONITOR:
+                result = cfg80211_set_monitor_channel(rdev, freq, channel_type);
+                break;
+        default:
+                result = -EINVAL;
         }
         mutex_unlock(&rdev->devlist_mtx);
 
@@ -1310,8 +1344,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 result = 0;
 
                 mutex_lock(&rdev->mtx);
-        } else if (netif_running(netdev) &&
-                   nl80211_can_set_dev_channel(netdev->ieee80211_ptr))
+        } else if (nl80211_can_set_dev_channel(netdev->ieee80211_ptr))
                 wdev = netdev->ieee80211_ptr;
         else
                 wdev = NULL;
@@ -2299,6 +2332,29 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                         info->attrs[NL80211_ATTR_INACTIVITY_TIMEOUT]);
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+
+                if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
+                    !nl80211_valid_channel_type(info, &channel_type))
+                        return -EINVAL;
+
+                params.channel = rdev_freq_to_chan(rdev,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
+                        channel_type);
+                if (!params.channel)
+                        return -EINVAL;
+                params.channel_type = channel_type;
+        } else if (wdev->preset_chan) {
+                params.channel = wdev->preset_chan;
+                params.channel_type = wdev->preset_chantype;
+        } else
+                return -EINVAL;
+
+        if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, params.channel,
+                                          params.channel_type))
+                return -EINVAL;
+
         err = rdev->ops->start_ap(&rdev->wiphy, dev, &params);
         if (!err)
                 wdev->beacon_interval = params.beacon_interval;
@@ -5489,18 +5545,18 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,
 
         duration = nla_get_u32(info->attrs[NL80211_ATTR_DURATION]);
 
+        if (!rdev->ops->remain_on_channel ||
+            !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))
+                return -EOPNOTSUPP;
+
         /*
-         * We should be on that channel for at least one jiffie,
-         * and more than 5 seconds seems excessive.
+         * We should be on that channel for at least a minimum amount of
+         * time (10ms) but no longer than the driver supports.
          */
-        if (!duration || !msecs_to_jiffies(duration) ||
+        if (duration < NL80211_MIN_REMAIN_ON_CHANNEL_TIME ||
             duration > rdev->wiphy.max_remain_on_channel_duration)
                 return -EINVAL;
 
-        if (!rdev->ops->remain_on_channel ||
-            !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))
-                return -EOPNOTSUPP;
-
         if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
             !nl80211_valid_channel_type(info, &channel_type))
                 return -EINVAL;
@@ -5771,6 +5827,15 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
                 if (!(rdev->wiphy.flags & WIPHY_FLAG_OFFCHAN_TX))
                         return -EINVAL;
                 wait = nla_get_u32(info->attrs[NL80211_ATTR_DURATION]);
+
+                /*
+                 * We should wait on the channel for at least a minimum amount
+                 * of time (10ms) but no longer than the driver supports.
+                 */
+                if (wait < NL80211_MIN_REMAIN_ON_CHANNEL_TIME ||
+                    wait > rdev->wiphy.max_remain_on_channel_duration)
+                        return -EINVAL;
+
         }
 
         if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
@@ -6032,6 +6097,24 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
                         return err;
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+
+                if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
+                    !nl80211_valid_channel_type(info, &channel_type))
+                        return -EINVAL;
+
+                setup.channel = rdev_freq_to_chan(rdev,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
+                        channel_type);
+                if (!setup.channel)
+                        return -EINVAL;
+                setup.channel_type = channel_type;
+        } else {
+                /* cfg80211_join_mesh() will sort it out */
+                setup.channel = NULL;
+        }
+
         return cfg80211_join_mesh(rdev, dev, &setup, &cfg);
 }