342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch 1.8 KB

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