diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 16:15:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 16:47:38 -0500 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /drivers/net/wireless/ath/carl9170/main.c | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
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 511dbe3caf58..870df8c42622 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c | |||
| @@ -1648,7 +1648,8 @@ void *carl9170_alloc(size_t priv_size) | |||
| 1648 | * supports these modes. The code which will add the | 1648 | * supports these modes. The code which will add the |
| 1649 | * additional interface_modes is in fw.c. | 1649 | * additional interface_modes is in fw.c. |
| 1650 | */ | 1650 | */ |
| 1651 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); | 1651 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | |
| 1652 | BIT(NL80211_IFTYPE_P2P_CLIENT); | ||
| 1652 | 1653 | ||
| 1653 | hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS | | 1654 | hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS | |
| 1654 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | | 1655 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | |