cfg80211: 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.

In the userspace API the field remains reserved to preserve
API and ABI.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 1 insertions, 5 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 380784378df8..8998484ea970 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3614,9 +3614,6 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
                 if (info->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH &&
                     nla_put_flag(msg, NL80211_RATE_INFO_80_MHZ_WIDTH))
                         return false;
-                if (info->flags & RATE_INFO_FLAGS_80P80_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_80P80_MHZ_WIDTH))
-                        return false;
                 if (info->flags & RATE_INFO_FLAGS_160_MHZ_WIDTH &&
                     nla_put_flag(msg, NL80211_RATE_INFO_160_MHZ_WIDTH))
                         return false;
diff --git a/net/wireless/util.c b/net/wireless/util.c
index d0ac795445b7..6942d48f1ac5 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1073,8 +1073,7 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
         if (WARN_ON_ONCE(rate->mcs > 9))
                 return 0;
 
-        idx = rate->flags & (RATE_INFO_FLAGS_160_MHZ_WIDTH |
-                             RATE_INFO_FLAGS_80P80_MHZ_WIDTH) ? 3 :
+        idx = rate->flags & RATE_INFO_FLAGS_160_MHZ_WIDTH ? 3 :
                   rate->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH ? 2 :
                   rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH ? 1 : 0;