Commit f89903d5 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove 80+80 MHz rate reporting 



These rates are treated the same as 160 MHz in the spec,
so it makes no sense to distinguish them. As no driver
uses them yet, this is also not a problem, just remove
them.

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

include/net/mac80211.h

+2 −4
Original line number Diff line number Diff line
@@ -931,15 +931,13 @@ enum mac80211_rx_flags { 
 * These flags are used with the @vht_flag member of

 *	&struct ieee80211_rx_status.

 * @RX_VHT_FLAG_80MHZ: 80 MHz was used

 * @RX_VHT_FLAG_80P80MHZ: 80+80 MHz was used

 * @RX_VHT_FLAG_160MHZ: 160 MHz was used

 * @RX_VHT_FLAG_BF: packet was beamformed

 */

enum mac80211_rx_vht_flags {

	RX_VHT_FLAG_80MHZ		= BIT(0),

	RX_VHT_FLAG_80P80MHZ		= BIT(1),

	RX_VHT_FLAG_160MHZ		= BIT(2),

	RX_VHT_FLAG_BF			= BIT(3),

	RX_VHT_FLAG_160MHZ		= BIT(1),

	RX_VHT_FLAG_BF			= BIT(2),

};



/**

net/mac80211/cfg.c

+0 −2
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) 
		rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;

	if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80MHZ)

		rinfo->flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;

	if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80P80MHZ)

		rinfo->flags |= RATE_INFO_FLAGS_80P80_MHZ_WIDTH;

	if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_160MHZ)

		rinfo->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;

}

net/mac80211/rx.c

+0 −5
Original line number Diff line number Diff line
@@ -361,9 +361,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
		u16 known = local->hw.radiotap_vht_details;



		rthdr->it_present |= cpu_to_le32(1 << IEEE80211_RADIOTAP_VHT);

		/* known field - how to handle 80+80? */

		if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)

			known &= ~IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;

		put_unaligned_le16(known, pos);

		pos += 2;

		/* flags */
@@ -378,8 +375,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
		/* bandwidth */

		if (status->vht_flag & RX_VHT_FLAG_80MHZ)

			*pos++ = 4;

		else if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)

			*pos++ = 0; /* marked not known above */

		else if (status->vht_flag & RX_VHT_FLAG_160MHZ)

			*pos++ = 11;

		else if (status->flag & RX_FLAG_40MHZ)

net/mac80211/util.c

+0 −2
Original line number Diff line number Diff line
@@ -2552,8 +2552,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, 
			ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;

		if (status->vht_flag & RX_VHT_FLAG_80MHZ)

			ri.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;

		if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)

			ri.flags |= RATE_INFO_FLAGS_80P80_MHZ_WIDTH;

		if (status->vht_flag & RX_VHT_FLAG_160MHZ)

			ri.flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;

		if (status->flag & RX_FLAG_SHORT_GI)

CRA Git | Maintained and supported by SUSTech CRA and CCSE