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

Commit 886fca85 authored by Visweswara Tanuku's avatar Visweswara Tanuku Committed by Gerrit - the friendly Code Review server
Browse files

cfg80211: treat 6 GHz channels as valid regardless of capability 



If a 6 GHz channel exists, then we can probably safely assume that
the device actually supports it, and then it should support most
bandwidths.

This will probably need to be extended to check the interface type
and then dig into the HE capabilities for that though, to have the
correct bandwidth check.

Change-Id: I77ea0ba56f4da1fa9f25baf5f44e0fe59c70e7c5
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-commit: ba8f6a037f790147438173029799f54c9d3065f2
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarVisweswara Tanuku <vtanuku@codeaurora.org>
parent d02dc74b

net/wireless/chan.c

+17 −6
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 *

 * Copyright 2009	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2018-2020	Intel Corporation

 */



#include <linux/export.h>
@@ -910,14 +911,18 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, 
		width = 10;

		break;

	case NL80211_CHAN_WIDTH_20:

		if (!ht_cap->ht_supported)

		if (!ht_cap->ht_supported &&

		    chandef->chan->band != NL80211_BAND_6GHZ)

			return false;

		/* fall through */

	case NL80211_CHAN_WIDTH_20_NOHT:

		prohibited_flags |= IEEE80211_CHAN_NO_20MHZ;

		width = 20;

		break;

	case NL80211_CHAN_WIDTH_40:

		width = 40;

		if (chandef->chan->band == NL80211_BAND_6GHZ)

			break;

		if (!ht_cap->ht_supported)

			return false;

		if (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) ||
@@ -932,23 +937,29 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, 
		break;

	case NL80211_CHAN_WIDTH_80P80:

		cap = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;

		if (cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)

		if (chandef->chan->band != NL80211_BAND_6GHZ &&

		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)

			return false;

		/* fall through */

	case NL80211_CHAN_WIDTH_80:

		if (!vht_cap->vht_supported)

			return false;

		prohibited_flags |= IEEE80211_CHAN_NO_80MHZ;

		width = 80;

		if (chandef->chan->band == NL80211_BAND_6GHZ)

			break;

		if (!vht_cap->vht_supported)

			return false;

		break;

	case NL80211_CHAN_WIDTH_160:

		prohibited_flags |= IEEE80211_CHAN_NO_160MHZ;

		width = 160;

		if (chandef->chan->band == NL80211_BAND_6GHZ)

			break;

		if (!vht_cap->vht_supported)

			return false;

		cap = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;

		if (cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&

		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)

			return false;

		prohibited_flags |= IEEE80211_CHAN_NO_160MHZ;

		width = 160;

		break;

	default:

		WARN_ON_ONCE(1);