diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 20:40:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-23 15:28:33 -0400 |
commit | 20c8e8dc4e9baf0c1b7c77c860726788896f2d9c (patch) | |
tree | abf7baf8050fa0f821cf624ed7959831023701ab /drivers/net/wireless | |
parent | 63b376411173c343bbcb450f95539da91f079e0c (diff) |
ath9k: add possible wiphy interface combinations
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 7a6b9f69a7b1..dee9e092449a 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -646,6 +646,24 @@ void ath9k_reload_chainmask_settings(struct ath_softc *sc) | |||
646 | setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap); | 646 | setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap); |
647 | } | 647 | } |
648 | 648 | ||
649 | static const struct ieee80211_iface_limit if_limits[] = { | ||
650 | { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | | ||
651 | BIT(NL80211_IFTYPE_P2P_CLIENT) | | ||
652 | BIT(NL80211_IFTYPE_WDS) }, | ||
653 | { .max = 8, .types = | ||
654 | #ifdef CONFIG_MAC80211_MESH | ||
655 | BIT(NL80211_IFTYPE_MESH_POINT) | | ||
656 | #endif | ||
657 | BIT(NL80211_IFTYPE_AP) | | ||
658 | BIT(NL80211_IFTYPE_P2P_GO) }, | ||
659 | }; | ||
660 | |||
661 | static const struct ieee80211_iface_combination if_comb = { | ||
662 | .limits = if_limits, | ||
663 | .n_limits = ARRAY_SIZE(if_limits), | ||
664 | .max_interfaces = 2048, | ||
665 | .num_different_channels = 1, | ||
666 | }; | ||
649 | 667 | ||
650 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | 668 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) |
651 | { | 669 | { |
@@ -675,6 +693,9 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
675 | BIT(NL80211_IFTYPE_ADHOC) | | 693 | BIT(NL80211_IFTYPE_ADHOC) | |
676 | BIT(NL80211_IFTYPE_MESH_POINT); | 694 | BIT(NL80211_IFTYPE_MESH_POINT); |
677 | 695 | ||
696 | hw->wiphy->iface_combinations = &if_comb; | ||
697 | hw->wiphy->n_iface_combinations = 1; | ||
698 | |||
678 | if (AR_SREV_5416(sc->sc_ah)) | 699 | if (AR_SREV_5416(sc->sc_ah)) |
679 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; | 700 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; |
680 | 701 | ||