diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-03-21 06:58:03 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:27:21 -0700 |
| commit | 99b8230daca979e0c0b988cfb80566791354a077 (patch) | |
| tree | 911e8d3e6b58a07c6461d99504951f7be2aa1c25 /net | |
| parent | e033155d0b495becfdc28f46ad20089dc8a13060 (diff) | |
| download | lwn-99b8230daca979e0c0b988cfb80566791354a077.tar.gz lwn-99b8230daca979e0c0b988cfb80566791354a077.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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 17fdbf8d4782..f134f88606ec 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3504,7 +3504,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; |