Commit baa32ff4 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

net: Use more bit fields in napi_gro_cb

This patch moves the free and same_flow fields to be bit fields
(2 and 1 bit sized respectively). This frees up some space for u16's.
Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6db93ea1
...@@ -1923,20 +1923,15 @@ struct napi_gro_cb { ...@@ -1923,20 +1923,15 @@ struct napi_gro_cb {
/* Number of segments aggregated. */ /* Number of segments aggregated. */
u16 count; 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 */ /* jiffies when first packet was created/queued */
unsigned long age; unsigned long age;
/* Used in ipv6_gro_receive() and foo-over-udp */ /* Used in ipv6_gro_receive() and foo-over-udp */
u16 proto; u16 proto;
/* This is non-zero if the packet may be of the same flow. */
u8 same_flow:1;
/* Used in udp_gro_receive */ /* Used in udp_gro_receive */
u8 udp_mark:1; u8 udp_mark:1;
...@@ -1946,9 +1941,16 @@ struct napi_gro_cb { ...@@ -1946,9 +1941,16 @@ struct napi_gro_cb {
/* Number of checksums via CHECKSUM_UNNECESSARY */ /* Number of checksums via CHECKSUM_UNNECESSARY */
u8 csum_cnt:3; 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 */ /* Used in foo-over-udp, set in udp[46]_gro_receive */
u8 is_ipv6:1; u8 is_ipv6:1;
/* 7 bit hole */
/* used to support CHECKSUM_COMPLETE for tunneling protocols */ /* used to support CHECKSUM_COMPLETE for tunneling protocols */
__wsum csum; __wsum csum;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment