]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: gro: only merge packets with incrementing or fixed outer ids
authorRichard Gobert <richardbgobert@gmail.com>
Tue, 23 Sep 2025 08:59:05 +0000 (10:59 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 25 Sep 2025 10:42:49 +0000 (12:42 +0200)
commit21f7484220ace6c355cb0023d14d83da6fe5843d
tree063845f030ed3e700913f0d92190b7e46c6c5a00
parent25c550464acd40803d63868dfa4a42506df48b88
net: gro: only merge packets with incrementing or fixed outer ids

Only merge encapsulated packets if their outer IDs are either
incrementing or fixed, just like for inner IDs and IDs of non-encapsulated
packets.

Add another ip_fixedid bit for a total of two bits: one for outer IDs (and
for unencapsulated packets) and one for inner IDs.

This commit preserves the current behavior of GSO where only the IDs of the
inner-most headers are restored correctly.

Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20250923085908.4687-3-richardbgobert@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
include/net/gro.h
net/ipv4/tcp_offload.c