Commit df78a0c0 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by Johannes Berg
Browse files

nl80211: S1G band and channel definitions 



Gives drivers the definitions needed to advertise support
for S1G bands.

Signed-off-by: default avatarThomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200602062247.23212-1-thomas@adapt-ip.com
Link: https://lore.kernel.org/r/20200731055636.795173-1-thomas@adapt-ip.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 41d707b7

drivers/net/wireless/ath/ath10k/mac.c

+2 −7
Original line number Diff line number Diff line
@@ -568,11 +568,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef) 
		case NL80211_CHAN_WIDTH_40:

			phymode = MODE_11NG_HT40;

			break;

		case NL80211_CHAN_WIDTH_5:

		case NL80211_CHAN_WIDTH_10:

		case NL80211_CHAN_WIDTH_80:

		case NL80211_CHAN_WIDTH_80P80:

		case NL80211_CHAN_WIDTH_160:

		default:

			phymode = MODE_UNKNOWN;

			break;

		}
@@ -597,8 +593,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef) 
		case NL80211_CHAN_WIDTH_80P80:

			phymode = MODE_11AC_VHT80_80;

			break;

		case NL80211_CHAN_WIDTH_5:

		case NL80211_CHAN_WIDTH_10:

		default:

			phymode = MODE_UNKNOWN;

			break;

		}

include/net/cfg80211.h

+17 −0
Original line number Diff line number Diff line
@@ -417,6 +417,22 @@ struct ieee80211_edmg { 
	enum ieee80211_edmg_bw_config bw_config;

};



/**

 * struct ieee80211_sta_s1g_cap - STA's S1G capabilities

 *

 * This structure describes most essential parameters needed

 * to describe 802.11ah S1G capabilities for a STA.

 *

 * @s1g_supported: is STA an S1G STA

 * @cap: S1G capabilities information

 * @nss_mcs: Supported NSS MCS set

 */

struct ieee80211_sta_s1g_cap {

	bool s1g;

	u8 cap[10]; /* use S1G_CAPAB_ */

	u8 nss_mcs[5];

};



/**

 * struct ieee80211_supported_band - frequency band definition

 *
@@ -448,6 +464,7 @@ struct ieee80211_supported_band { 
	int n_bitrates;

	struct ieee80211_sta_ht_cap ht_cap;

	struct ieee80211_sta_vht_cap vht_cap;

	struct ieee80211_sta_s1g_cap s1g_cap;

	struct ieee80211_edmg edmg_cap;

	u16 n_iftype_data;

	const struct ieee80211_sband_iftype_data *iftype_data;

include/uapi/linux/nl80211.h

+16 −0
Original line number Diff line number Diff line
@@ -4437,6 +4437,11 @@ enum nl80211_key_mode { 
 *	attribute must be provided as well

 * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_1: 1 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_2: 2 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_4: 4 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_8: 8 MHz OFDM channel

 * @NL80211_CHAN_WIDTH_16: 16 MHz OFDM channel

 */

enum nl80211_chan_width {

	NL80211_CHAN_WIDTH_20_NOHT,
@@ -4447,6 +4452,11 @@ enum nl80211_chan_width { 
	NL80211_CHAN_WIDTH_160,

	NL80211_CHAN_WIDTH_5,

	NL80211_CHAN_WIDTH_10,

	NL80211_CHAN_WIDTH_1,

	NL80211_CHAN_WIDTH_2,

	NL80211_CHAN_WIDTH_4,

	NL80211_CHAN_WIDTH_8,

	NL80211_CHAN_WIDTH_16,

};



/**
@@ -4457,11 +4467,15 @@ enum nl80211_chan_width { 
 * @NL80211_BSS_CHAN_WIDTH_20: control channel is 20 MHz wide or compatible

 * @NL80211_BSS_CHAN_WIDTH_10: control channel is 10 MHz wide

 * @NL80211_BSS_CHAN_WIDTH_5: control channel is 5 MHz wide

 * @NL80211_BSS_CHAN_WIDTH_1: control channel is 1 MHz wide

 * @NL80211_BSS_CHAN_WIDTH_2: control channel is 2 MHz wide

 */

enum nl80211_bss_scan_width {

	NL80211_BSS_CHAN_WIDTH_20,

	NL80211_BSS_CHAN_WIDTH_10,

	NL80211_BSS_CHAN_WIDTH_5,

	NL80211_BSS_CHAN_WIDTH_1,

	NL80211_BSS_CHAN_WIDTH_2,

};



/**
@@ -4740,6 +4754,7 @@ enum nl80211_txrate_gi { 
 * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)

 * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)

 * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz)

 * @NL80211_BAND_S1GHZ: around 900MHz, supported by S1G PHYs

 * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace

 *	since newer kernel versions may support more bands

 */
@@ -4748,6 +4763,7 @@ enum nl80211_band { 
	NL80211_BAND_5GHZ,

	NL80211_BAND_60GHZ,

	NL80211_BAND_6GHZ,

	NL80211_BAND_S1GHZ,



	NUM_NL80211_BANDS,

};

net/mac80211/chan.c

+6 −1
Original line number Diff line number Diff line
@@ -313,9 +313,14 @@ void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, 


	lockdep_assert_held(&local->chanctx_mtx);



	/* don't optimize 5MHz, 10MHz, and radar_enabled confs */

	/* don't optimize non-20MHz based and radar_enabled confs */

	if (ctx->conf.def.width == NL80211_CHAN_WIDTH_5 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_10 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_1 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_2 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_4 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_8 ||

	    ctx->conf.def.width == NL80211_CHAN_WIDTH_16 ||

	    ctx->conf.radar_enabled) {

		ctx->conf.min_def = ctx->conf.def;

		return;

net/mac80211/scan.c

+1 −0
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local, 
	case NL80211_BSS_CHAN_WIDTH_10:

		local->scan_chandef.width = NL80211_CHAN_WIDTH_10;

		break;

	default:

	case NL80211_BSS_CHAN_WIDTH_20:

		/* If scanning on oper channel, use whatever channel-type

		 * is currently in use.

CRA Git | Maintained and supported by SUSTech CRA and CCSE