package/kernel/mac80211/patches/324-Revert-wireless-set-correct-mandatory-rate-flags.patch

   1 From: Matthias Schiffer <mschiffer@universe-factory.net>
   2 Date: Fri, 26 Jan 2018 23:23:37 +0100
   3 Subject: [PATCH] Revert "wireless: set correct mandatory rate flags"
   4
   5 This reverts commit 1bd773c077deeeb2d9ced1fdb6d846169b8e7e4a.
   6 ---
   7  net/wireless/util.c | 30 ++++++++++++++++--------------
   8  1 file changed, 16 insertions(+), 14 deletions(-)
   9
  10 diff --git a/net/wireless/util.c b/net/wireless/util.c
  11 index c69160694b6c..2bb37231c8fe 100644
  12 --- a/net/wireless/util.c
  13 +++ b/net/wireless/util.c
  14 @@ -157,30 +157,32 @@ static void set_mandatory_flags_band(str
  15         case NL80211_BAND_2GHZ:
  16                 want = 7;
  17                 for (i = 0; i < sband->n_bitrates; i++) {
  18 -                       switch (sband->bitrates[i].bitrate) {
  19 -                       case 10:
  20 -                       case 20:
  21 -                       case 55:
  22 -                       case 110:
  23 +                       if (sband->bitrates[i].bitrate == 10) {
  24                                 sband->bitrates[i].flags |=
  25                                         IEEE80211_RATE_MANDATORY_B |
  26                                         IEEE80211_RATE_MANDATORY_G;
  27                                 want--;
  28 -                               break;
  29 -                       case 60:
  30 -                       case 120:
  31 -                       case 240:
  32 +                       }
  33 +
  34 +                       if (sband->bitrates[i].bitrate == 20 ||
  35 +                           sband->bitrates[i].bitrate == 55 ||
  36 +                           sband->bitrates[i].bitrate == 110 ||
  37 +                           sband->bitrates[i].bitrate == 60 ||
  38 +                           sband->bitrates[i].bitrate == 120 ||
  39 +                           sband->bitrates[i].bitrate == 240) {
  40                                 sband->bitrates[i].flags |=
  41                                         IEEE80211_RATE_MANDATORY_G;
  42                                 want--;
  43 -                               /* fall through */
  44 -                       default:
  45 +                       }
  46 +
  47 +                       if (sband->bitrates[i].bitrate != 10 &&
  48 +                           sband->bitrates[i].bitrate != 20 &&
  49 +                           sband->bitrates[i].bitrate != 55 &&
  50 +                           sband->bitrates[i].bitrate != 110)
  51                                 sband->bitrates[i].flags |=
  52                                         IEEE80211_RATE_ERP_G;
  53 -                               break;
  54 -                       }
  55                 }
  56 -               WARN_ON(want != 0 && want != 3);
  57 +               WARN_ON(want != 0 && want != 3 && want != 6);
  58                 break;
  59         case NL80211_BAND_60GHZ:
  60                 /* check for mandatory HT MCS 1..4 */