Commit 5dca295d authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Add initial support for EHT and 320 MHz channels 



Add initial support for EHT and 320 MHz bandwidth in mac80211.

As a new IEEE80211_STA_RX_BW_320 is added to
enum ieee80211_sta_rx_bandwidth, update the drivers to avoid
compilation warnings.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Link: https://lore.kernel.org/r/20220214173004.0f144cc0bba6.Iad18111264da87eed5fd7b017f0cc6e58c604e07@changeid


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

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	}



	switch (sta->bandwidth) {

	case IEEE80211_STA_RX_BW_320:

	case IEEE80211_STA_RX_BW_160:

		add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_160MHZ);

		fallthrough;

drivers/net/wireless/mac80211_hwsim.c

+1 −0
Original line number Diff line number Diff line
@@ -2195,6 +2195,7 @@ mac80211_hwsim_sta_rc_update(struct ieee80211_hw *hw, 
	C(40);

	C(80);

	C(160);

	C(320);

#undef C

	}

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -2005,6 +2005,7 @@ enum ieee80211_sta_state { 
 * @IEEE80211_STA_RX_BW_80: station can receive up to 80 MHz

 * @IEEE80211_STA_RX_BW_160: station can receive up to 160 MHz

 *	(including 80+80 MHz)

 * @IEEE80211_STA_RX_BW_320: station can receive up to 320 MHz

 *

 * Implementation note: 20 must be zero to be initialized

 *	correctly, the values must be sorted.
@@ -2014,6 +2015,7 @@ enum ieee80211_sta_rx_bandwidth { 
	IEEE80211_STA_RX_BW_40,

	IEEE80211_STA_RX_BW_80,

	IEEE80211_STA_RX_BW_160,

	IEEE80211_STA_RX_BW_320,

};



/**

net/mac80211/chan.c

+4 −1
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ static enum nl80211_chan_width ieee80211_get_sta_bw(struct sta_info *sta) 
		 * might be smaller than the configured bw (160).

		 */

		return NL80211_CHAN_WIDTH_160;

	case IEEE80211_STA_RX_BW_320:

		return NL80211_CHAN_WIDTH_320;

	default:

		WARN_ON(1);

		return NL80211_CHAN_WIDTH_20;
@@ -417,7 +419,7 @@ static void ieee80211_change_chanctx(struct ieee80211_local *local, 
{

	u32 changed;



	/* expected to handle only 20/40/80/160 channel widths */

	/* expected to handle only 20/40/80/160/320 channel widths */

	switch (chandef->width) {

	case NL80211_CHAN_WIDTH_20_NOHT:

	case NL80211_CHAN_WIDTH_20:
@@ -425,6 +427,7 @@ static void ieee80211_change_chanctx(struct ieee80211_local *local, 
	case NL80211_CHAN_WIDTH_80:

	case NL80211_CHAN_WIDTH_80P80:

	case NL80211_CHAN_WIDTH_160:

	case NL80211_CHAN_WIDTH_320:

		break;

	default:

		WARN_ON(1);

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -366,6 +366,8 @@ enum ieee80211_sta_flags { 
	IEEE80211_STA_DISABLE_WMM	= BIT(14),

	IEEE80211_STA_ENABLE_RRM	= BIT(15),

	IEEE80211_STA_DISABLE_HE	= BIT(16),

	IEEE80211_STA_DISABLE_EHT	= BIT(17),

	IEEE80211_STA_DISABLE_320MHZ	= BIT(18),

};



struct ieee80211_mgd_auth_data {
@@ -2414,6 +2416,7 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, u32 vht_cap_info, 
				struct cfg80211_chan_def *chandef);

bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,

				    const struct ieee80211_he_operation *he_oper,

				    const struct ieee80211_eht_operation *eht_oper,

				    struct cfg80211_chan_def *chandef);

bool ieee80211_chandef_s1g_oper(const struct ieee80211_s1g_oper_ie *oper,

				struct cfg80211_chan_def *chandef);