summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-02-02 14:39:08 +0100
committerJohannes Berg <johannes.berg@intel.com>2016-02-24 09:04:33 +0100
commit88665f5a797a832ff7926ad2287ee41738bc09b9 (patch)
treeef3d53d5b3235177a8eabc6ee4b523c9f64bf7ac /net/mac80211
parentea32f065bd3e3e09f0bcb3042f1664caf6b3e233 (diff)
downloadlinux-stable-88665f5a797a832ff7926ad2287ee41738bc09b9.tar.gz
linux-stable-88665f5a797a832ff7926ad2287ee41738bc09b9.tar.bz2
linux-stable-88665f5a797a832ff7926ad2287ee41738bc09b9.zip
mac80211: move A-MSDU skb_linearize call to ieee80211_amsdu_to_8023s
Prepararation for zero-copy A-MSDU support with page fragment SKBs Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9fb7074f0280..44192143ebdf 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2223,9 +2223,6 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
skb->dev = dev;
__skb_queue_head_init(&frame_list);
- if (skb_linearize(skb))
- return RX_DROP_UNUSABLE;
-
ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
rx->sdata->vif.type,
rx->local->hw.extra_tx_headroom, true);