summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorRichard Gobert <richardbgobert@gmail.com>2024-05-14 20:06:15 +0300
committerJakub Kicinski <kuba@kernel.org>2024-05-14 20:49:50 +0300
commit386f0cffae4654f6db1c0d8ad8273511f925f719 (patch)
treee82954bf721d1b585aeac0eabce6986d421e75e8 /include/net
parent79982e8f8a01b2e2bfcae17aa7cd55586e172564 (diff)
downloadlinux-386f0cffae4654f6db1c0d8ad8273511f925f719.tar.xz
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: 4b0ebbca3e16 ("net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment") Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Richard Gobert <richardbgobert@gmail.com> Link: https://lore.kernel.org/r/fca08735-c245-49e5-af72-82900634f144@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/gro.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/gro.h b/include/net/gro.h
index f13634b1f4c1..b9b58c1f8d19 100644
--- a/include/net/gro.h
+++ b/include/net/gro.h
@@ -42,8 +42,7 @@ struct napi_gro_cb {
/* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */
u16 proto;
- /* used to support CHECKSUM_COMPLETE for tunneling protocols */
- __wsum csum;
+ u16 pad;
/* Used in napi_gro_cb::free */
#define NAPI_GRO_FREE 1
@@ -85,6 +84,9 @@ struct napi_gro_cb {
u8 is_flist:1;
);
+ /* used to support CHECKSUM_COMPLETE for tunneling protocols */
+ __wsum csum;
+
/* L3 offsets */
union {
struct {