cfg80211: change bandwidth reporting to explicit field

For some reason, we made the bandwidth separate flags, which
is rather confusing - a single rate cannot have different
bandwidths at the same time.

Change this to no longer be flags but use a separate field
for the bandwidth ('bw') instead.

While at it, add support for 5 and 10 MHz rates - these are
reported as regular legacy rates with their real bitrate,
but tagged as 5/10 now to make it easier to distinguish them.

In the nl80211 API, the flags are preserved, but the code
now can also clearly only set a single one of the flags.

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

2 files changed, 47 insertions, 17 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8998484ea970..8e56eeb583aa 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3578,6 +3578,7 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
         struct nlattr *rate;
         u32 bitrate;
         u16 bitrate_compat;
+        enum nl80211_attrs rate_flg;
 
         rate = nla_nest_start(msg, attr);
         if (!rate)
@@ -3594,12 +3595,36 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
             nla_put_u16(msg, NL80211_RATE_INFO_BITRATE, bitrate_compat))
                 return false;
 
+        switch (info->bw) {
+        case RATE_INFO_BW_5:
+                rate_flg = NL80211_RATE_INFO_5_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_10:
+                rate_flg = NL80211_RATE_INFO_10_MHZ_WIDTH;
+                break;
+        default:
+                WARN_ON(1);
+                /* fall through */
+        case RATE_INFO_BW_20:
+                rate_flg = 0;
+                break;
+        case RATE_INFO_BW_40:
+                rate_flg = NL80211_RATE_INFO_40_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_80:
+                rate_flg = NL80211_RATE_INFO_80_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_160:
+                rate_flg = NL80211_RATE_INFO_160_MHZ_WIDTH;
+                break;
+        }
+
+        if (rate_flg && nla_put_flag(msg, rate_flg))
+                return false;
+
         if (info->flags & RATE_INFO_FLAGS_MCS) {
                 if (nla_put_u8(msg, NL80211_RATE_INFO_MCS, info->mcs))
                         return false;
-                if (info->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_40_MHZ_WIDTH))
-                        return false;
                 if (info->flags & RATE_INFO_FLAGS_SHORT_GI &&
                     nla_put_flag(msg, NL80211_RATE_INFO_SHORT_GI))
                         return false;
@@ -3608,15 +3633,6 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
                         return false;
                 if (nla_put_u8(msg, NL80211_RATE_INFO_VHT_NSS, info->nss))
                         return false;
-                if (info->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_40_MHZ_WIDTH))
-                        return false;
-                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_160_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_160_MHZ_WIDTH))
-                        return false;
                 if (info->flags & RATE_INFO_FLAGS_SHORT_GI &&
                     nla_put_flag(msg, NL80211_RATE_INFO_SHORT_GI))
                         return false;
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 6942d48f1ac5..3535e8ade48f 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1073,9 +1073,24 @@ 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 ? 3 :
-                  rate->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH ? 2 :
-                  rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH ? 1 : 0;
+        switch (rate->bw) {
+        case RATE_INFO_BW_160:
+                idx = 3;
+                break;
+        case RATE_INFO_BW_80:
+                idx = 2;
+                break;
+        case RATE_INFO_BW_40:
+                idx = 1;
+                break;
+        case RATE_INFO_BW_5:
+        case RATE_INFO_BW_10:
+        default:
+                WARN_ON(1);
+                /* fall through */
+        case RATE_INFO_BW_20:
+                idx = 0;
+        }
 
         bitrate = base[idx][rate->mcs];
         bitrate *= rate->nss;
@@ -1106,8 +1121,7 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate)
         modulation = rate->mcs & 7;
         streams = (rate->mcs >> 3) + 1;
 
-        bitrate = (rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH) ?
-                        13500000 : 6500000;
+        bitrate = (rate->bw == RATE_INFO_BW_40) ? 13500000 : 6500000;
 
         if (modulation < 4)
                 bitrate *= (modulation + 1);