|
@@ -3560,7 +3560,8 @@ EXPORT_SYMBOL(napi_gro_receive);
|
|
static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
|
|
static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
|
|
{
|
|
{
|
|
__skb_pull(skb, skb_headlen(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->vlan_tci = 0;
|
|
skb->dev = napi->dev;
|
|
skb->dev = napi->dev;
|
|
skb->skb_iif = 0;
|
|
skb->skb_iif = 0;
|