diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:21 +0800 |
| commit | 108df9c204f549150c7e1e3262ffd19bd624269e (patch) | |
| tree | e8937a341eb355b7bde6ec8438e735019534ada0 /include/linux | |
| parent | 8e20db3c84b5391b73530e260886387596a26d4d (diff) | |
| parent | 8433e5c9c8304b750c519ce3e0940dab675f6573 (diff) | |
Merge tag 'v3.18.47' into linux-linaro-lsk-v3.18
This is the 3.18.47 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 70fde9c5c61d..49ac10f99da0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1888,22 +1888,17 @@ struct napi_gro_cb { /* Number of segments aggregated. */ u16 count; - /* This is non-zero if the packet may be of the same flow. */ - u8 same_flow; - - /* Free the skb? */ - u8 free; -#define NAPI_GRO_FREE 1 -#define NAPI_GRO_FREE_STOLEN_HEAD 2 - /* jiffies when first packet was created/queued */ unsigned long age; /* Used in ipv6_gro_receive() and foo-over-udp */ u16 proto; - /* Used in udp_gro_receive */ - u8 udp_mark:1; + /* This is non-zero if the packet may be of the same flow. */ + u8 same_flow:1; + + /* Used in tunnel GRO receive */ + u8 encap_mark:1; /* GRO checksum is valid */ u8 csum_valid:1; @@ -1911,9 +1906,16 @@ struct napi_gro_cb { /* Number of checksums via CHECKSUM_UNNECESSARY */ u8 csum_cnt:3; + /* Free the skb? */ + u8 free:2; +#define NAPI_GRO_FREE 1 +#define NAPI_GRO_FREE_STOLEN_HEAD 2 + /* Used in foo-over-udp, set in udp[46]_gro_receive */ u8 is_ipv6:1; + /* 7 bit hole */ + /* used to support CHECKSUM_COMPLETE for tunneling protocols */ __wsum csum; |