Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ec75fc authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

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: default avatarJanusz Dziedzic <janusz.dziedzic@tieto.com>
Reported-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 67ae07a1

net/wireless/chan.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -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;