summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorCedric Izoard2016-12-07 10:59:00 +0100
committerJohannes Berg2016-12-13 16:08:37 +0100
commitd8da0b5d64d58f7775a94bcf12dda50f13a76f22 (patch)
tree8917bf008b76210a2eea4bfa5bcce62d67681b09 /net
parentmac80211: don't call drv_set_default_unicast_key() for VLANs (diff)
downloadkernel-qcow2-linux-d8da0b5d64d58f7775a94bcf12dda50f13a76f22.tar.gz
kernel-qcow2-linux-d8da0b5d64d58f7775a94bcf12dda50f13a76f22.tar.xz
kernel-qcow2-linux-d8da0b5d64d58f7775a94bcf12dda50f13a76f22.zip
mac80211: Ensure enough headroom when forwarding mesh pkt
When a buffer is duplicated during MESH packet forwarding, this patch ensures that the new buffer has enough headroom. Signed-off-by: Cedric Izoard <cedric.izoard@ceva-dsp.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index eeab7250f4b9..3e289a64ed43 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2472,7 +2472,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
if (!ifmsh->mshcfg.dot11MeshForwarding)
goto out;
- fwd_skb = skb_copy(skb, GFP_ATOMIC);
+ fwd_skb = skb_copy_expand(skb, local->tx_headroom, 0, GFP_ATOMIC);
if (!fwd_skb) {
net_info_ratelimited("%s: failed to clone mesh frame\n",
sdata->name);