mac80211: set station bandwidth from HE capability (cf2c9cc3) · Commits · 戴 / test

net/mac80211/he.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		* HE handling
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		* Copyright(c) 2019 Intel Corporation
		*/

		#include "ieee80211_i.h"
		@@ -49,6 +50,9 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,
		he_ppe_size);

		he_cap->has_he = true;

		sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(sta);
		sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta);
		}

		void

+23 −0

Original line number	Diff line number	Diff line
		@@ -333,11 +333,33 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
		}
		}

		/* FIXME: move this to some better location - parses HE now */
		enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta)
		{
		struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;
		struct ieee80211_sta_he_cap *he_cap = &sta->sta.he_cap;
		u32 cap_width;

		if (he_cap->has_he) {
		u8 info = he_cap->he_cap_elem.phy_cap_info[0];

		if (sta->sdata->vif.bss_conf.chandef.chan->band ==
		NL80211_BAND_2GHZ) {
		if (info & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G)
		return IEEE80211_STA_RX_BW_40;
		else
		return IEEE80211_STA_RX_BW_20;
		}

		if (info & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G \|\|
		info & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)
		return IEEE80211_STA_RX_BW_160;
		else if (info & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G)
		return IEEE80211_STA_RX_BW_80;

		return IEEE80211_STA_RX_BW_20;
		}

		if (!vht_cap->vht_supported)
		return sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
		IEEE80211_STA_RX_BW_40 :
		@@ -433,6 +455,7 @@ ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
		}
		}

		/* FIXME: rename/move - this deals with everything not just VHT */
		enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)
		{
		struct ieee80211_sub_if_data *sdata = sta->sdata;