diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 4b5e5484868..623c2f88498 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
| @@ -622,7 +622,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
| 622 | IEEE80211_HW_SIGNAL_DBM | | 622 | IEEE80211_HW_SIGNAL_DBM | |
| 623 | IEEE80211_HW_SUPPORTS_PS | | 623 | IEEE80211_HW_SUPPORTS_PS | |
| 624 | IEEE80211_HW_PS_NULLFUNC_STACK | | 624 | IEEE80211_HW_PS_NULLFUNC_STACK | |
| 625 | IEEE80211_HW_SPECTRUM_MGMT; | 625 | IEEE80211_HW_SPECTRUM_MGMT | |
| 626 | IEEE80211_HW_REPORTS_TX_ACK_STATUS; | ||
| 626 | 627 | ||
| 627 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) | 628 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) |
| 628 | hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; | 629 | hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; |