Skip to content

Commit 386f0cf

Browse files
Richard Gobertkuba-moo
authored andcommitted
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: 4b0ebbc ("net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment") Suggested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Richard Gobert <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 79982e8 commit 386f0cf

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

include/net/gro.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ struct napi_gro_cb {
4242
/* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */
4343
u16 proto;
4444

45-
/* used to support CHECKSUM_COMPLETE for tunneling protocols */
46-
__wsum csum;
45+
u16 pad;
4746

4847
/* Used in napi_gro_cb::free */
4948
#define NAPI_GRO_FREE 1
@@ -85,6 +84,9 @@ struct napi_gro_cb {
8584
u8 is_flist:1;
8685
);
8786

87+
/* used to support CHECKSUM_COMPLETE for tunneling protocols */
88+
__wsum csum;
89+
8890
/* L3 offsets */
8991
union {
9092
struct {

0 commit comments

Comments
 (0)