Commit 88665f5a authored Feb 02, 2016 by Felix Fietkau Committed by Johannes Berg Feb 24, 2016

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>

parent ea32f065

net/mac80211/rx.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);

net/wireless/util.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -657,6 +657,9 @@ void ieee80211_amsdu_to_8023s(struct sk_buff skb, struct sk_buff_head list,
		int remaining, err;
		u8 dst[ETH_ALEN], src[ETH_ALEN];

		if (skb_linearize(skb))
		goto out;

		if (has_80211_header) {
		err = ieee80211_data_to_8023(skb, addr, iftype);
		if (err)