311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  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. Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  5. ---
  6. --- a/drivers/net/wireless/ath/ath9k/init.c
  7. +++ b/drivers/net/wireless/ath/ath9k/init.c
  8. @@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
  9. #endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
  10. -static const struct ieee80211_iface_limit if_dfs_limits[] = {
  11. - { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
  12. -#ifdef CPTCFG_MAC80211_MESH
  13. - BIT(NL80211_IFTYPE_MESH_POINT) |
  14. -#endif
  15. - BIT(NL80211_IFTYPE_ADHOC) },
  16. -};
  17. -
  18. static const struct ieee80211_iface_combination if_comb[] = {
  19. {
  20. .limits = if_limits,
  21. @@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
  22. .max_interfaces = 2048,
  23. .num_different_channels = 1,
  24. .beacon_int_infra_match = true,
  25. +#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
  26. + .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
  27. + BIT(NL80211_CHAN_WIDTH_20) |
  28. + BIT(NL80211_CHAN_WIDTH_40),
  29. +#endif
  30. },
  31. {
  32. .limits = wds_limits,
  33. @@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
  34. .num_different_channels = 1,
  35. .beacon_int_infra_match = true,
  36. },
  37. -#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
  38. - {
  39. - .limits = if_dfs_limits,
  40. - .n_limits = ARRAY_SIZE(if_dfs_limits),
  41. - .max_interfaces = 1,
  42. - .num_different_channels = 1,
  43. - .beacon_int_infra_match = true,
  44. - .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
  45. - BIT(NL80211_CHAN_WIDTH_20) |
  46. - BIT(NL80211_CHAN_WIDTH_40),
  47. - }
  48. -#endif
  49. };
  50. #ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT