diff options
author | Felix Fietkau <nbd@openwrt.orq> | 2012-04-17 00:39:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-29 13:42:45 -0400 |
commit | 9b4760e301e1cceb0b49bd2b921d6b394d364584 (patch) | |
tree | 495ba1baf4eef57f2cfaaeddea52aa7ffcb958ef /drivers/net | |
parent | 992e68bf2eb9f3319f098560b8d4a03aa52fd7b8 (diff) |
ath5k: add possible wiphy interface combinations
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 0ba81a66061f..fbaa30930076 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -2415,6 +2415,22 @@ ath5k_tx_complete_poll_work(struct work_struct *work) | |||
2415 | * Initialization routines * | 2415 | * Initialization routines * |
2416 | \*************************/ | 2416 | \*************************/ |
2417 | 2417 | ||
2418 | static const struct ieee80211_iface_limit if_limits[] = { | ||
2419 | { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) }, | ||
2420 | { .max = 4, .types = | ||
2421 | #ifdef CONFIG_MAC80211_MESH | ||
2422 | BIT(NL80211_IFTYPE_MESH_POINT) | | ||
2423 | #endif | ||
2424 | BIT(NL80211_IFTYPE_AP) }, | ||
2425 | }; | ||
2426 | |||
2427 | static const struct ieee80211_iface_combination if_comb = { | ||
2428 | .limits = if_limits, | ||
2429 | .n_limits = ARRAY_SIZE(if_limits), | ||
2430 | .max_interfaces = 2048, | ||
2431 | .num_different_channels = 1, | ||
2432 | }; | ||
2433 | |||
2418 | int __devinit | 2434 | int __devinit |
2419 | ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) | 2435 | ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) |
2420 | { | 2436 | { |
@@ -2436,6 +2452,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) | |||
2436 | BIT(NL80211_IFTYPE_ADHOC) | | 2452 | BIT(NL80211_IFTYPE_ADHOC) | |
2437 | BIT(NL80211_IFTYPE_MESH_POINT); | 2453 | BIT(NL80211_IFTYPE_MESH_POINT); |
2438 | 2454 | ||
2455 | hw->wiphy->iface_combinations = &if_comb; | ||
2456 | hw->wiphy->n_iface_combinations = 1; | ||
2457 | |||
2439 | /* SW support for IBSS_RSN is provided by mac80211 */ | 2458 | /* SW support for IBSS_RSN is provided by mac80211 */ |
2440 | hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; | 2459 | hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; |
2441 | 2460 | ||