diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-04 15:22:52 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-04 15:22:52 -0500 |
| commit | 7b87e573413c3d6a006f572fb4d2105ff5d97fda (patch) | |
| tree | e8eb1fbc2fabcf2113c0876e86f3f6c029cdf54d /drivers/net/wireless/ath/carl9170/fw.c | |
| parent | fdb184d1467f9ed5b17c553b85eb1bb72bdbf62f (diff) | |
| parent | 9a6f7347f59f55433ec50578e8d42d305e0d53ae (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/fw.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/fw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c index aaebecd19e5..63fd9af3fd3 100644 --- a/drivers/net/wireless/ath/carl9170/fw.c +++ b/drivers/net/wireless/ath/carl9170/fw.c @@ -336,8 +336,12 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) if (SUPP(CARL9170FW_WLANTX_CAB)) { if_comb_types |= BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_MESH_POINT) | BIT(NL80211_IFTYPE_P2P_GO); + +#ifdef CONFIG_MAC80211_MESH + if_comb_types |= + BIT(NL80211_IFTYPE_MESH_POINT); +#endif /* CONFIG_MAC80211_MESH */ } } |