diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 16:36:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 16:36:09 +0200 |
| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa (patch) | |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | rt2800: fix wrong TX power compensation (diff) | |
| parent | ath9k: Enable PLL fix only for AR9340/AR9330 (diff) | |
| download | linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.xz linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c
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 c9f787dea3f6..9a1f349f9260 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -834,7 +834,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) IEEE80211_HW_PS_NULLFUNC_STACK | IEEE80211_HW_SPECTRUM_MGMT | IEEE80211_HW_REPORTS_TX_ACK_STATUS | - IEEE80211_HW_SUPPORTS_RC_TABLE; + IEEE80211_HW_SUPPORTS_RC_TABLE | + IEEE80211_HW_SUPPORTS_HT_CCK_RATES; if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) { hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; |