diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 08:13:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 08:13:01 -0800 |
| commit | 4f58605e6b7ae30a0d048af6a868582768e6754c (patch) | |
| tree | 2b72e81761c7874b48825267958e58823e05b592 /drivers/net/wireless/ath/carl9170/main.c | |
| parent | b8eb3a1046f68a5b8f284830d971c62688cd606b (diff) | |
| parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) | |
| download | blackbird-op-linux-4f58605e6b7ae30a0d048af6a868582768e6754c.tar.gz blackbird-op-linux-4f58605e6b7ae30a0d048af6a868582768e6754c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index a314c2c2bfbe..dc7b30b170d0 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -1631,7 +1631,8 @@ void *carl9170_alloc(size_t priv_size) * supports these modes. The code which will add the * additional interface_modes is in fw.c. */ - hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_P2P_CLIENT); hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_REPORTS_TX_ACK_STATUS | |
