From 2d10c32a989247d4af1b75b0a719fac333c5981a Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 30 Aug 2011 09:34:01 +0300
Subject: [PATCH] --- yaml --- r: 266243 b: refs/heads/master c:
 93f8c8e02597b7d7997c4a0a10173ac90ad378e8 h: refs/heads/master i:   266241:
 43ea16e5ddefeebc392935fdd702e1fc134d1efe   266239:
 79d1193d4f9a44b874ec8089d10a7c49d00f5c12 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd7c78a48f91..071331c98980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1acea9a9d48174f982e14a7a488b208d39d825f
+refs/heads/master: 93f8c8e02597b7d7997c4a0a10173ac90ad378e8
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 45cd10ab3aac..ade62b3d9a2c 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -4506,7 +4506,9 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
 		IEEE80211_HW_SUPPORTS_CQM_RSSI |
 		IEEE80211_HW_REPORTS_TX_ACK_STATUS |
 		IEEE80211_HW_SPECTRUM_MGMT |
-		IEEE80211_HW_AP_LINK_PS;
+		IEEE80211_HW_AP_LINK_PS |
+		IEEE80211_HW_AMPDU_AGGREGATION |
+		IEEE80211_HW_TX_AMPDU_SETUP_IN_HW;
 
 	wl->hw->wiphy->cipher_suites = cipher_suites;
 	wl->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);