package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Wed, 14 Dec 2016 20:23:29 +0100
   3 Subject: [PATCH] mac80211: minstrel_ht: remove obsolete #if for >= 3 streams
   4
   5 This was added during early development when 3x3 hardware was not very
   6 common yet. This is completely unnecessary now.
   7
   8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   9 ---
  10
  11 --- a/net/mac80211/rc80211_minstrel_ht.c
  12 +++ b/net/mac80211/rc80211_minstrel_ht.c
  13 @@ -155,67 +155,47 @@ MODULE_PARM_DESC(minstrel_vht_only,
  14  const struct mcs_group minstrel_mcs_groups[] = {
  15         MCS_GROUP(1, 0, BW_20),
  16         MCS_GROUP(2, 0, BW_20),
  17 -#if MINSTREL_MAX_STREAMS >= 3
  18         MCS_GROUP(3, 0, BW_20),
  19 -#endif
  20
  21         MCS_GROUP(1, 1, BW_20),
  22         MCS_GROUP(2, 1, BW_20),
  23 -#if MINSTREL_MAX_STREAMS >= 3
  24         MCS_GROUP(3, 1, BW_20),
  25 -#endif
  26
  27         MCS_GROUP(1, 0, BW_40),
  28         MCS_GROUP(2, 0, BW_40),
  29 -#if MINSTREL_MAX_STREAMS >= 3
  30         MCS_GROUP(3, 0, BW_40),
  31 -#endif
  32
  33         MCS_GROUP(1, 1, BW_40),
  34         MCS_GROUP(2, 1, BW_40),
  35 -#if MINSTREL_MAX_STREAMS >= 3
  36         MCS_GROUP(3, 1, BW_40),
  37 -#endif
  38
  39         CCK_GROUP,
  40
  41  #ifdef CPTCFG_MAC80211_RC_MINSTREL_VHT
  42         VHT_GROUP(1, 0, BW_20),
  43         VHT_GROUP(2, 0, BW_20),
  44 -#if MINSTREL_MAX_STREAMS >= 3
  45         VHT_GROUP(3, 0, BW_20),
  46 -#endif
  47
  48         VHT_GROUP(1, 1, BW_20),
  49         VHT_GROUP(2, 1, BW_20),
  50 -#if MINSTREL_MAX_STREAMS >= 3
  51         VHT_GROUP(3, 1, BW_20),
  52 -#endif
  53
  54         VHT_GROUP(1, 0, BW_40),
  55         VHT_GROUP(2, 0, BW_40),
  56 -#if MINSTREL_MAX_STREAMS >= 3
  57         VHT_GROUP(3, 0, BW_40),
  58 -#endif
  59
  60         VHT_GROUP(1, 1, BW_40),
  61         VHT_GROUP(2, 1, BW_40),
  62 -#if MINSTREL_MAX_STREAMS >= 3
  63         VHT_GROUP(3, 1, BW_40),
  64 -#endif
  65
  66         VHT_GROUP(1, 0, BW_80),
  67         VHT_GROUP(2, 0, BW_80),
  68 -#if MINSTREL_MAX_STREAMS >= 3
  69         VHT_GROUP(3, 0, BW_80),
  70 -#endif
  71
  72         VHT_GROUP(1, 1, BW_80),
  73         VHT_GROUP(2, 1, BW_80),
  74 -#if MINSTREL_MAX_STREAMS >= 3
  75         VHT_GROUP(3, 1, BW_80),
  76  #endif
  77 -#endif
  78  };
  79
  80  static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES] __read_mostly;