aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwl8k.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-01-04 21:58:12 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-05 17:13:34 -0500
commita2292d83b5dcb7f378956a124854d2b17fa53aa3 (patch)
tree26f935a10f9aa789829dc0e69cf9b5f7c3958aeb /drivers/net/wireless/mwl8k.c
parent13935e2cf39b124c9a2ff0349b294e0b1e2e3aef (diff)
downloadkernel_samsung_smdk4412-a2292d83b5dcb7f378956a124854d2b17fa53aa3.zip
kernel_samsung_smdk4412-a2292d83b5dcb7f378956a124854d2b17fa53aa3.tar.gz
kernel_samsung_smdk4412-a2292d83b5dcb7f378956a124854d2b17fa53aa3.tar.bz2
mwl8k: trivial rx-only ampdu implementation
AMPDU receive doesn't need any special handling, so let's enable this before tackling the transmit side. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r--drivers/net/wireless/mwl8k.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index e0301b6..57ced0d 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3309,6 +3309,22 @@ static int mwl8k_get_stats(struct ieee80211_hw *hw,
return mwl8k_cmd_get_stat(hw, stats);
}
+static int
+mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ enum ieee80211_ampdu_mlme_action action,
+ struct ieee80211_sta *sta, u16 tid, u16 *ssn)
+{
+ switch (action) {
+ case IEEE80211_AMPDU_RX_START:
+ case IEEE80211_AMPDU_RX_STOP:
+ if (!(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION))
+ return -ENOTSUPP;
+ return 0;
+ default:
+ return -ENOTSUPP;
+ }
+}
+
static const struct ieee80211_ops mwl8k_ops = {
.tx = mwl8k_tx,
.start = mwl8k_start,
@@ -3324,6 +3340,7 @@ static const struct ieee80211_ops mwl8k_ops = {
.conf_tx = mwl8k_conf_tx,
.get_tx_stats = mwl8k_get_tx_stats,
.get_stats = mwl8k_get_stats,
+ .ampdu_action = mwl8k_ampdu_action,
};
static void mwl8k_tx_reclaim_handler(unsigned long data)