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

1 files changed, 13 insertions, 13 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index b677eab55b68..9245729694d2 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -57,9 +57,6 @@ struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
 {
         struct cfg80211_registered_device *result = NULL, *rdev;
 
-        if (!wiphy_idx_valid(wiphy_idx))
-                return NULL;
-
         assert_cfg80211_lock();
 
         list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
@@ -74,10 +71,8 @@ struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
 
 int get_wiphy_idx(struct wiphy *wiphy)
 {
-        struct cfg80211_registered_device *rdev;
-        if (!wiphy)
-                return WIPHY_IDX_STALE;
-        rdev = wiphy_to_dev(wiphy);
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+
         return rdev->wiphy_idx;
 }
 
@@ -86,9 +81,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
 {
         struct cfg80211_registered_device *rdev;
 
-        if (!wiphy_idx_valid(wiphy_idx))
-                return NULL;
-
         assert_cfg80211_lock();
 
         rdev = cfg80211_rdev_by_wiphy_idx(wiphy_idx);
@@ -309,7 +301,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
 
         rdev->wiphy_idx = wiphy_counter++;
 
-        if (unlikely(!wiphy_idx_valid(rdev->wiphy_idx))) {
+        if (unlikely(rdev->wiphy_idx < 0)) {
                 wiphy_counter--;
                 mutex_unlock(&cfg80211_mutex);
                 /* ugh, wrapped! */
@@ -390,8 +382,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
 
                 c = &wiphy->iface_combinations[i];
 
-                /* Combinations with just one interface aren't real */
-                if (WARN_ON(c->max_interfaces < 2))
+                /*
+                 * Combinations with just one interface aren't real,
+                 * however we make an exception for DFS.
+                 */
+                if (WARN_ON((c->max_interfaces < 2) && !c->radar_detect_widths))
                         return -EINVAL;
 
                 /* Need at least one channel */
@@ -406,6 +401,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
                                 CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
                         return -EINVAL;
 
+                /* DFS only works on one channel. */
+                if (WARN_ON(c->radar_detect_widths &&
+                            (c->num_different_channels > 1)))
+                        return -EINVAL;
+
                 if (WARN_ON(!c->n_limits))
                         return -EINVAL;