projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
cw1200
/
main.c
diff --git
a/drivers/net/wireless/cw1200/main.c
b/drivers/net/wireless/cw1200/main.c
index fa965ee9f56bdf2145f59f53c427df03b1de999c..3689dbbd10bdf8da4cb54c0ace89b91bf067ace5 100644
(file)
--- a/
drivers/net/wireless/cw1200/main.c
+++ b/
drivers/net/wireless/cw1200/main.c
@@
-282,7
+282,6
@@
static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr,
IEEE80211_HW_SUPPORTS_PS |
IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
IEEE80211_HW_REPORTS_TX_ACK_STATUS |
- IEEE80211_HW_SUPPORTS_UAPSD |
IEEE80211_HW_CONNECTION_MONITOR |
IEEE80211_HW_AMPDU_AGGREGATION |
IEEE80211_HW_TX_AMPDU_SETUP_IN_HW |