diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-20 23:33:40 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 23:33:40 +0300 |
| commit | 4320f21935534dad44e8d112fc085d13c29e7f66 (patch) | |
| tree | a00832901f84e7d6eeb773061e8d0746da323bd8 /include/linux/netdevice.h | |
| parent | 659e0bcaebc4ca36e64eac6e9f39c1904b17472c (diff) | |
| parent | a09a4c8dd1ec7f830e1fb9e59eb72bddc965d168 (diff) | |
| download | linux-4320f21935534dad44e8d112fc085d13c29e7f66.tar.xz | |
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 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index be693b34662f..f9eebd518545 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2096,8 +2096,8 @@ struct napi_gro_cb { /* This is non-zero if the packet may be of the same flow. */ u8 same_flow:1; - /* Used in udp_gro_receive */ - u8 udp_mark:1; + /* Used in tunnel GRO receive */ + u8 encap_mark:1; /* GRO checksum is valid */ u8 csum_valid:1; |