diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-22 00:44:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-22 00:44:59 -0700 |
| commit | 8fd90bb889635fa1e7f80a3950948cc2e74c1446 (patch) | |
| tree | 1490343b5ad9f88b9333e53fa9457c00cbf6c2d1 /net/core | |
| parent | 1bb4238b17b5de6cdc120970a9d00dd8a44f40df (diff) | |
| parent | 15ba2236f3556fc01b9ca91394465152b5ea74b6 (diff) | |
| download | op-kernel-dev-8fd90bb889635fa1e7f80a3950948cc2e74c1446.zip op-kernel-dev-8fd90bb889635fa1e7f80a3950948cc2e74c1446.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e52a378..e1b7cfa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4106,6 +4106,8 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) skb->vlan_tci = 0; skb->dev = napi->dev; skb->skb_iif = 0; + skb->encapsulation = 0; + skb_shinfo(skb)->gso_type = 0; skb->truesize = SKB_TRUESIZE(skb_end_offset(skb)); napi->skb = skb; |
