diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-20 16:33:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 16:33:40 -0400 |
| commit | 4320f21935534dad44e8d112fc085d13c29e7f66 (patch) | |
| tree | a00832901f84e7d6eeb773061e8d0746da323bd8 /net/core | |
| parent | 659e0bcaebc4ca36e64eac6e9f39c1904b17472c (diff) | |
| parent | a09a4c8dd1ec7f830e1fb9e59eb72bddc965d168 (diff) | |
Merge branch 'tunnel-fixes'
Jesse Gross says:
====================
Tunneling fixes
This series fixes a problem that was reported where encapsulated packets
do not have their encapsulation offload markers stripped off when being
decapsulated. This causes a significant performance drop if the packets
are later retransmitted.
Fixing this revealed two other bugs which are also addressed as prerequisites:
* GRO can aggregate packets for multiple layers of encapsulation which the
stack cannot properly handle.
* IPIP packets which are combined by GRO are not marked properly with their
GSO type.
Note that this is based off the net-next tree as the current target for
bug fixes.
v2: No code changes, just additional information in commit messages and
a new cover letter.
====================
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, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index edb7179bc051..43c74cad25bc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4438,7 +4438,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff NAPI_GRO_CB(skb)->same_flow = 0; NAPI_GRO_CB(skb)->flush = 0; NAPI_GRO_CB(skb)->free = 0; - NAPI_GRO_CB(skb)->udp_mark = 0; + NAPI_GRO_CB(skb)->encap_mark = 0; NAPI_GRO_CB(skb)->gro_remcsum_start = 0; /* Setup for GRO checksum validation */ |