Commit 1286558e authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo
Browse files

ath9k: do not limit the number of DFS channel interfaces to 1 



I think this limit was added when CSA with multiple interfaces wasn't
working yet. It should no longer be necessary

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 0d87c920

drivers/net/wireless/ath/ath9k/init.c

+5 −20
Original line number Diff line number Diff line
@@ -751,14 +751,6 @@ static const struct ieee80211_iface_combination if_comb_multi[] = { 


#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */



static const struct ieee80211_iface_limit if_dfs_limits[] = {

	{ .max = 1,	.types = BIT(NL80211_IFTYPE_AP) |

#ifdef CONFIG_MAC80211_MESH

				 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

				 BIT(NL80211_IFTYPE_ADHOC) },

};



static const struct ieee80211_iface_combination if_comb[] = {

	{

		.limits = if_limits,
@@ -766,6 +758,11 @@ static const struct ieee80211_iface_combination if_comb[] = { 
		.max_interfaces = 2048,

		.num_different_channels = 1,

		.beacon_int_infra_match = true,

#ifdef CONFIG_ATH9K_DFS_CERTIFIED

		.radar_detect_widths =	BIT(NL80211_CHAN_WIDTH_20_NOHT) |

					BIT(NL80211_CHAN_WIDTH_20) |

					BIT(NL80211_CHAN_WIDTH_40),

#endif

	},

	{

		.limits = wds_limits,
@@ -774,18 +771,6 @@ static const struct ieee80211_iface_combination if_comb[] = { 
		.num_different_channels = 1,

		.beacon_int_infra_match = true,

	},

#ifdef CONFIG_ATH9K_DFS_CERTIFIED

	{

		.limits = if_dfs_limits,

		.n_limits = ARRAY_SIZE(if_dfs_limits),

		.max_interfaces = 1,

		.num_different_channels = 1,

		.beacon_int_infra_match = true,

		.radar_detect_widths =	BIT(NL80211_CHAN_WIDTH_20_NOHT) |

					BIT(NL80211_CHAN_WIDTH_20) |

					BIT(NL80211_CHAN_WIDTH_40),

	}

#endif

};



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT