diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-08-28 10:36:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 10:36:09 -0400 |
| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa (patch) | |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | rt2800: fix wrong TX power compensation (diff) | |
| parent | ath9k: Enable PLL fix only for AR9340/AR9330 (diff) | |
| download | linux-dev-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.xz linux-dev-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/rt2x00/rt2800lib.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 660d7d856186..95e6e61c3de0 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -7489,7 +7489,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_PS_NULLFUNC_STACK | IEEE80211_HW_AMPDU_AGGREGATION | - IEEE80211_HW_REPORTS_TX_ACK_STATUS; + IEEE80211_HW_REPORTS_TX_ACK_STATUS | + IEEE80211_HW_SUPPORTS_HT_CCK_RATES; /* * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices |