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
...@@ -931,15 +931,13 @@ enum mac80211_rx_flags { ...@@ -931,15 +931,13 @@ enum mac80211_rx_flags {
* These flags are used with the @vht_flag member of * These flags are used with the @vht_flag member of
* &struct ieee80211_rx_status. * &struct ieee80211_rx_status.
* @RX_VHT_FLAG_80MHZ: 80 MHz was used * @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_160MHZ: 160 MHz was used
* @RX_VHT_FLAG_BF: packet was beamformed * @RX_VHT_FLAG_BF: packet was beamformed
*/ */
enum mac80211_rx_vht_flags { enum mac80211_rx_vht_flags {
RX_VHT_FLAG_80MHZ = BIT(0), RX_VHT_FLAG_80MHZ = BIT(0),
RX_VHT_FLAG_80P80MHZ = BIT(1), RX_VHT_FLAG_160MHZ = BIT(1),
RX_VHT_FLAG_160MHZ = BIT(2), RX_VHT_FLAG_BF = BIT(2),
RX_VHT_FLAG_BF = BIT(3),
}; };
/** /**
......
...@@ -465,8 +465,6 @@ void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) ...@@ -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; rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80MHZ) if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80MHZ)
rinfo->flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH; 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) if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_160MHZ)
rinfo->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH; rinfo->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
} }
......
...@@ -361,9 +361,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, ...@@ -361,9 +361,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
u16 known = local->hw.radiotap_vht_details; u16 known = local->hw.radiotap_vht_details;
rthdr->it_present |= cpu_to_le32(1 << IEEE80211_RADIOTAP_VHT); 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); put_unaligned_le16(known, pos);
pos += 2; pos += 2;
/* flags */ /* flags */
...@@ -378,8 +375,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, ...@@ -378,8 +375,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
/* bandwidth */ /* bandwidth */
if (status->vht_flag & RX_VHT_FLAG_80MHZ) if (status->vht_flag & RX_VHT_FLAG_80MHZ)
*pos++ = 4; *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) else if (status->vht_flag & RX_VHT_FLAG_160MHZ)
*pos++ = 11; *pos++ = 11;
else if (status->flag & RX_FLAG_40MHZ) else if (status->flag & RX_FLAG_40MHZ)
......
...@@ -2552,8 +2552,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, ...@@ -2552,8 +2552,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
if (status->vht_flag & RX_VHT_FLAG_80MHZ) if (status->vht_flag & RX_VHT_FLAG_80MHZ)
ri.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH; 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) if (status->vht_flag & RX_VHT_FLAG_160MHZ)
ri.flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH; ri.flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
if (status->flag & RX_FLAG_SHORT_GI) if (status->flag & RX_FLAG_SHORT_GI)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment