package/kernel/mac80211/patches/subsys/320-mac80211_hwsim-add-6GHz-channels.patch

   1 From: Ramon Fontes <ramonreisfontes@gmail.com>
   2 Date: Sun, 27 Dec 2020 00:11:55 -0300
   3 Subject: [PATCH] mac80211_hwsim: add 6GHz channels
   4
   5 Advertise 6GHz channels to mac80211.
   6
   7 Signed-off-by: Ramon Fontes <ramonreisfontes@gmail.com>
   8 Link: https://lore.kernel.org/r/20201227031155.81161-1-ramonreisfontes@gmail.com
   9 [reword commit message]
  10 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  11 ---
  12
  13 --- a/drivers/net/wireless/mac80211_hwsim.c
  14 +++ b/drivers/net/wireless/mac80211_hwsim.c
  15 @@ -311,6 +311,12 @@ static struct net_device *hwsim_mon; /*
  16         .hw_value = (_freq), \
  17  }
  18
  19 +#define CHAN6G(_freq) { \
  20 +       .band = NL80211_BAND_6GHZ, \
  21 +       .center_freq = (_freq), \
  22 +       .hw_value = (_freq), \
  23 +}
  24 +
  25  static const struct ieee80211_channel hwsim_channels_2ghz[] = {
  26         CHAN2G(2412), /* Channel 1 */
  27         CHAN2G(2417), /* Channel 2 */
  28 @@ -377,6 +383,68 @@ static const struct ieee80211_channel hw
  29         CHAN5G(5925), /* Channel 185 */
  30  };
  31
  32 +static const struct ieee80211_channel hwsim_channels_6ghz[] = {
  33 +       CHAN6G(5955), /* Channel 1 */
  34 +       CHAN6G(5975), /* Channel 5 */
  35 +       CHAN6G(5995), /* Channel 9 */
  36 +       CHAN6G(6015), /* Channel 13 */
  37 +       CHAN6G(6035), /* Channel 17 */
  38 +       CHAN6G(6055), /* Channel 21 */
  39 +       CHAN6G(6075), /* Channel 25 */
  40 +       CHAN6G(6095), /* Channel 29 */
  41 +       CHAN6G(6115), /* Channel 33 */
  42 +       CHAN6G(6135), /* Channel 37 */
  43 +       CHAN6G(6155), /* Channel 41 */
  44 +       CHAN6G(6175), /* Channel 45 */
  45 +       CHAN6G(6195), /* Channel 49 */
  46 +       CHAN6G(6215), /* Channel 53 */
  47 +       CHAN6G(6235), /* Channel 57 */
  48 +       CHAN6G(6255), /* Channel 61 */
  49 +       CHAN6G(6275), /* Channel 65 */
  50 +       CHAN6G(6295), /* Channel 69 */
  51 +       CHAN6G(6315), /* Channel 73 */
  52 +       CHAN6G(6335), /* Channel 77 */
  53 +       CHAN6G(6355), /* Channel 81 */
  54 +       CHAN6G(6375), /* Channel 85 */
  55 +       CHAN6G(6395), /* Channel 89 */
  56 +       CHAN6G(6415), /* Channel 93 */
  57 +       CHAN6G(6435), /* Channel 97 */
  58 +       CHAN6G(6455), /* Channel 181 */
  59 +       CHAN6G(6475), /* Channel 105 */
  60 +       CHAN6G(6495), /* Channel 109 */
  61 +       CHAN6G(6515), /* Channel 113 */
  62 +       CHAN6G(6535), /* Channel 117 */
  63 +       CHAN6G(6555), /* Channel 121 */
  64 +       CHAN6G(6575), /* Channel 125 */
  65 +       CHAN6G(6595), /* Channel 129 */
  66 +       CHAN6G(6615), /* Channel 133 */
  67 +       CHAN6G(6635), /* Channel 137 */
  68 +       CHAN6G(6655), /* Channel 141 */
  69 +       CHAN6G(6675), /* Channel 145 */
  70 +       CHAN6G(6695), /* Channel 149 */
  71 +       CHAN6G(6715), /* Channel 153 */
  72 +       CHAN6G(6735), /* Channel 157 */
  73 +       CHAN6G(6755), /* Channel 161 */
  74 +       CHAN6G(6775), /* Channel 165 */
  75 +       CHAN6G(6795), /* Channel 169 */
  76 +       CHAN6G(6815), /* Channel 173 */
  77 +       CHAN6G(6835), /* Channel 177 */
  78 +       CHAN6G(6855), /* Channel 181 */
  79 +       CHAN6G(6875), /* Channel 185 */
  80 +       CHAN6G(6895), /* Channel 189 */
  81 +       CHAN6G(6915), /* Channel 193 */
  82 +       CHAN6G(6935), /* Channel 197 */
  83 +       CHAN6G(6955), /* Channel 201 */
  84 +       CHAN6G(6975), /* Channel 205 */
  85 +       CHAN6G(6995), /* Channel 209 */
  86 +       CHAN6G(7015), /* Channel 213 */
  87 +       CHAN6G(7035), /* Channel 217 */
  88 +       CHAN6G(7055), /* Channel 221 */
  89 +       CHAN6G(7075), /* Channel 225 */
  90 +       CHAN6G(7095), /* Channel 229 */
  91 +       CHAN6G(7115), /* Channel 233 */
  92 +};
  93 +
  94  #define NUM_S1G_CHANS_US 51
  95  static struct ieee80211_channel hwsim_channels_s1g[NUM_S1G_CHANS_US];
  96
  97 @@ -548,6 +616,7 @@ struct mac80211_hwsim_data {
  98         struct ieee80211_supported_band bands[NUM_NL80211_BANDS];
  99         struct ieee80211_channel channels_2ghz[ARRAY_SIZE(hwsim_channels_2ghz)];
 100         struct ieee80211_channel channels_5ghz[ARRAY_SIZE(hwsim_channels_5ghz)];
 101 +       struct ieee80211_channel channels_6ghz[ARRAY_SIZE(hwsim_channels_6ghz)];
 102         struct ieee80211_channel channels_s1g[ARRAY_SIZE(hwsim_channels_s1g)];
 103         struct ieee80211_rate rates[ARRAY_SIZE(hwsim_rates)];
 104         struct ieee80211_iface_combination if_combination;
 105 @@ -578,7 +647,8 @@ struct mac80211_hwsim_data {
 106                 struct ieee80211_channel *channel;
 107                 unsigned long next_start, start, end;
 108         } survey_data[ARRAY_SIZE(hwsim_channels_2ghz) +
 109 -                     ARRAY_SIZE(hwsim_channels_5ghz)];
 110 +                     ARRAY_SIZE(hwsim_channels_5ghz) +
 111 +                     ARRAY_SIZE(hwsim_channels_6ghz)];
 112
 113         struct ieee80211_channel *channel;
 114         u64 beacon_int  /* beacon interval in us */;
 115 @@ -3149,6 +3219,8 @@ static int mac80211_hwsim_new_radio(stru
 116                 sizeof(hwsim_channels_2ghz));
 117         memcpy(data->channels_5ghz, hwsim_channels_5ghz,
 118                 sizeof(hwsim_channels_5ghz));
 119 +       memcpy(data->channels_6ghz, hwsim_channels_6ghz,
 120 +               sizeof(hwsim_channels_6ghz));
 121         memcpy(data->channels_s1g, hwsim_channels_s1g,
 122                sizeof(hwsim_channels_s1g));
 123         memcpy(data->rates, hwsim_rates, sizeof(hwsim_rates));