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

Commit 736c52d9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage"

parents b7211712 3f29fea0

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


/* Indicate support for including KEK length in rekey data */

#define CFG80211_REKEY_DATA_KEK_LEN 1

/* Indicate backport support for 6GHz band */

#define CFG80211_6GHZ_BAND_SUPPORTED 1



/**

 * DOC: Introduction

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);

net/wireless/core.c

+10 −0
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ int wiphy_register(struct wiphy *wiphy) 
	/* sanity check supported bands/channels */

	for (band = 0; band < NUM_NL80211_BANDS; band++) {

		u16 types = 0;

		bool have_he = false;



		sband = wiphy->bands[band];

		if (!sband)
@@ -811,8 +812,17 @@ int wiphy_register(struct wiphy *wiphy) 
				return -EINVAL;



			types |= iftd->types_mask;



			if (i == 0)

				have_he = iftd->he_cap.has_he;

			else

				have_he = have_he &&

					  iftd->he_cap.has_he;

		}



		if (WARN_ON(!have_he && band == NL80211_BAND_6GHZ))

			return -EINVAL;



		have_band = true;

	}

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -5470,7 +5470,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) 


	if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])

		params.he_6ghz_capa =

			nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);

			nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]);



	/* Include parameters for TDLS peer (will check later) */

	err = nl80211_set_station_tdls(info, &params);