summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-03-21 06:58:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-02 10:32:23 -0700
commit52efe5ed4eed36082fb4fc95601a5e9cc49ec868 (patch)
treee956ead526347b067eb444e0376b223fc50b344f
parentdcc799d3484f7b85bb5220cdab294e10fbe26c5b (diff)
downloadlinux-stable-52efe5ed4eed36082fb4fc95601a5e9cc49ec868.tar.gz
linux-stable-52efe5ed4eed36082fb4fc95601a5e9cc49ec868.tar.bz2
linux-stable-52efe5ed4eed36082fb4fc95601a5e9cc49ec868.zip
net: fix napi_reuse_skb() skb reserve
[ Upstream commit 2a2a459eeeff48640dc557548ce576d666ab06ed ] napi->skb is allocated in napi_get_frags() using netdev_alloc_skb_ip_align(), with a reserve of NET_SKB_PAD + NET_IP_ALIGN bytes. However, when such skb is recycled in napi_reuse_skb(), it ends with a reserve of NET_IP_ALIGN which is suboptimal. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/core/dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 6ca32f6b3105..a4bf94369aae 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3569,7 +3569,8 @@ EXPORT_SYMBOL(napi_gro_receive);
static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
{
__skb_pull(skb, skb_headlen(skb));
- skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
+ /* restore the reserve we had after netdev_alloc_skb_ip_align() */
+ skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
skb->vlan_tci = 0;
skb->dev = napi->dev;
skb->skb_iif = 0;