Commit 386f0cff authored by Richard Gobert's avatar Richard Gobert Committed by Jakub Kicinski

net: gro: fix napi_gro_cb zeroed alignment

Add 2 byte padding to napi_gro_cb struct to ensure zeroed member is
aligned after flush_id member was removed in the original commit.

Fixes: 4b0ebbca ("net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment")
Suggested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarRichard Gobert <richardbgobert@gmail.com>
Link: https://lore.kernel.org/r/fca08735-c245-49e5-af72-82900634f144@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 79982e8f
...@@ -42,8 +42,7 @@ struct napi_gro_cb { ...@@ -42,8 +42,7 @@ struct napi_gro_cb {
/* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */ /* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */
u16 proto; u16 proto;
/* used to support CHECKSUM_COMPLETE for tunneling protocols */ u16 pad;
__wsum csum;
/* Used in napi_gro_cb::free */ /* Used in napi_gro_cb::free */
#define NAPI_GRO_FREE 1 #define NAPI_GRO_FREE 1
...@@ -85,6 +84,9 @@ struct napi_gro_cb { ...@@ -85,6 +84,9 @@ struct napi_gro_cb {
u8 is_flist:1; u8 is_flist:1;
); );
/* used to support CHECKSUM_COMPLETE for tunneling protocols */
__wsum csum;
/* L3 offsets */ /* L3 offsets */
union { union {
struct { struct {
......
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