Skip to content

Commit

Permalink
mac80211: move A-MSDU skb_linearize call to ieee80211_amsdu_to_8023s
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Felix Fietkau authored and Johannes Berg committed Feb 24, 2016
1 parent ea32f06 commit 88665f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions net/mac80211/rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions net/wireless/util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 88665f5

Please sign in to comment.