summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-22 11:35:22 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-08-22 11:35:22 -0400
commit89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd (patch)
tree15e14665089f6603c07e4bfc8ba4011f97a23744 /drivers/net/wireless/rt2x00
parent48c3e371350701444db51e8b35b5928d74dbacc3 (diff)
parent75a423f493ffdf741acae27bf179cd560f7813d7 (diff)
downloadblackbird-op-linux-89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd.tar.gz
blackbird-op-linux-89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 1f80ea5e29dd..1b41c8eda12d 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -6133,7 +6133,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
OpenPOWER on IntegriCloud