package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch

   1 From: Felix Fietkau <nbd@openwrt.org>
   2 Date: Fri, 22 Jan 2016 01:05:56 +0100
   3 Subject: [PATCH] ath9k: do not limit the number of DFS interfaces to 1
   4
   5 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
   6 ---
   7
   8 --- a/drivers/net/wireless/ath/ath9k/init.c
   9 +++ b/drivers/net/wireless/ath/ath9k/init.c
  10 @@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
  11
  12  #endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
  13
  14 -static const struct ieee80211_iface_limit if_dfs_limits[] = {
  15 -       { .max = 1,     .types = BIT(NL80211_IFTYPE_AP) |
  16 -#ifdef CPTCFG_MAC80211_MESH
  17 -                                BIT(NL80211_IFTYPE_MESH_POINT) |
  18 -#endif
  19 -                                BIT(NL80211_IFTYPE_ADHOC) },
  20 -};
  21 -
  22  static const struct ieee80211_iface_combination if_comb[] = {
  23         {
  24                 .limits = if_limits,
  25 @@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
  26                 .max_interfaces = 2048,
  27                 .num_different_channels = 1,
  28                 .beacon_int_infra_match = true,
  29 +#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
  30 +               .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
  31 +                                       BIT(NL80211_CHAN_WIDTH_20) |
  32 +                                       BIT(NL80211_CHAN_WIDTH_40),
  33 +#endif
  34         },
  35         {
  36                 .limits = wds_limits,
  37 @@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
  38                 .num_different_channels = 1,
  39                 .beacon_int_infra_match = true,
  40         },
  41 -#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
  42 -       {
  43 -               .limits = if_dfs_limits,
  44 -               .n_limits = ARRAY_SIZE(if_dfs_limits),
  45 -               .max_interfaces = 1,
  46 -               .num_different_channels = 1,
  47 -               .beacon_int_infra_match = true,
  48 -               .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
  49 -                                       BIT(NL80211_CHAN_WIDTH_20) |
  50 -                                       BIT(NL80211_CHAN_WIDTH_40),
  51 -       }
  52 -#endif
  53  };
  54
  55  #ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT