diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2013-06-26 15:06:58 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-27 13:45:18 -0400 |
| commit | 0c9acaa8357a334645c96d505528a20f2fd4ac0a (patch) | |
| tree | 283dd6e8349a2c1b6addb0bf254b0e5e68157817 /drivers/net/wireless | |
| parent | cc1b5463947a009d6303dc6dc436326f34617499 (diff) | |
| download | linux-0c9acaa8357a334645c96d505528a20f2fd4ac0a.tar.bz2 | |
ath9k_htc: ifdef out IFTYPE_MESH advertisement
This is needed so the interface combination can still be
validated when CONFIG_MAC80211_MESH is not enabled.
Otherwise wiphy registration fails.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 925c5b0b1cde..71a183ffc77f 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -701,8 +701,10 @@ static const struct ieee80211_iface_limit if_limits[] = { { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_P2P_CLIENT) }, { .max = 2, .types = BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_P2P_GO) | - BIT(NL80211_IFTYPE_MESH_POINT) }, +#ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | +#endif + BIT(NL80211_IFTYPE_P2P_GO) }, }; static const struct ieee80211_iface_combination if_comb = { |