cfg80211: pass the actual iftype when calling cfg80211_chandef_dfs_required()

There is no need to pass NL80211_IFTYPE_UNSPECIFIED when calling
cfg80211_chandef_dfs_required() since we always already have the
interface type.  So, pass the actual interface type instead.

Additionally, have cfg80211_chandef_dfs_required() WARN if the passed
interface type is NL80211_IFTYPE_UNSPECIFIED, so we can detect
problems more easily.

Tested-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Reported-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 7a679a6e1d1a234bf1f2669723e72db14ec168b3..992b34070bcb16f9fe4323bae293996524f1373c 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -340,7 +340,6 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
        case NL80211_IFTYPE_AP:
        case NL80211_IFTYPE_P2P_GO:
        case NL80211_IFTYPE_MESH_POINT:
-       case NL80211_IFTYPE_UNSPECIFIED:
                width = cfg80211_chandef_get_width(chandef);
                if (width < 0)
                        return -EINVAL;
@@ -372,6 +371,7 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
        case NL80211_IFTYPE_WDS:
        case NL80211_IFTYPE_P2P_DEVICE:
                break;
+       case NL80211_IFTYPE_UNSPECIFIED:
        case NUM_NL80211_IFTYPES:
                WARN_ON(1);
        }
@@ -796,8 +796,7 @@ bool cfg80211_reg_can_beacon(struct wiphy *wiphy,
            !cfg80211_go_permissive_chan(rdev, chandef->chan))
                prohibited_flags |= IEEE80211_CHAN_NO_IR;
 
-       if (cfg80211_chandef_dfs_required(wiphy, chandef,
-                                         NL80211_IFTYPE_UNSPECIFIED) > 0 &&
+       if (cfg80211_chandef_dfs_required(wiphy, chandef, iftype) > 0 &&
            cfg80211_chandef_dfs_available(wiphy, chandef)) {
                /* We can skip IEEE80211_CHAN_NO_IR if chandef dfs available */
                prohibited_flags = IEEE80211_CHAN_DISABLED;

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c0833830cfe73424da9f74782d077ef110a3e35c..74e7299e4add3842bfec2d5c00d82cdf0e0ccd9b 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5822,7 +5822,7 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
                return -EBUSY;
 
        err = cfg80211_chandef_dfs_required(wdev->wiphy, &chandef,
-                                           NL80211_IFTYPE_UNSPECIFIED);
+                                           wdev->iftype);
        if (err < 0)
                return err;