diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-09 16:28:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-09 16:28:45 -0700 |
| commit | 3118e6e19da7b8d76b2456b880c74a9aa3a2268b (patch) | |
| tree | 3060d11297c1195ef2d1f120d9c2247b4b1de4ae /net/ipv4/fou.c | |
| parent | feca7d8c135bc1527b244fe817b8b6498066ccec (diff) | |
| parent | 48fb6f4db940e92cfb16cd878cddd59ea6120d06 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.
The TCP conflict was a case of local variables in a function
being removed from both net and net-next.
In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fou.c')
| -rw-r--r-- | net/ipv4/fou.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c index 8e0257d01200..1540db65241a 100644 --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -450,6 +450,7 @@ out_unlock: out: NAPI_GRO_CB(skb)->flush |= flush; skb_gro_remcsum_cleanup(skb, &grc); + skb->remcsum_offload = 0; return pp; } |