diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
| commit | 95a943c162d74b20d869917bdf5df11293c35b63 (patch) | |
| tree | c69d5cb97a4d97b6062a276ecdfa8582535193af /drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
| parent | ecae42d37045ec71831d0e0e493e00b0e0732edd (diff) | |
| parent | 95acac61ba66c4abd40e038dae8c1ed2e176c7b1 (diff) | |
| download | op-kernel-dev-95a943c162d74b20d869917bdf5df11293c35b63.zip op-kernel-dev-95a943c162d74b20d869917bdf5df11293c35b63.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 61e6d39..3bea7ea 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -754,6 +754,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_PS_NULLFUNC_STACK | + IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING; hw->wiphy->interface_modes = |
