diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 18:59:29 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 19:01:01 +0200 |
| commit | e7073830cc8b52ef3df7dd150e4dac7706e0e104 (patch) | |
| tree | e257cb163ac414e82acf319ab8cdd98ad4434036 /include/net/xfrm.h | |
| parent | l2tp: Support several sockets with same IP/port quadruple (diff) | |
| parent | Merge tag 'net-6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-e7073830cc8b52ef3df7dd150e4dac7706e0e104.tar.xz linux-e7073830cc8b52ef3df7dd150e4dac7706e0e104.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 7c9be06f8302..77ebf5bcf0b9 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1050,6 +1050,9 @@ struct xfrm_offload { #define CRYPTO_INVALID_PACKET_SYNTAX 64 #define CRYPTO_INVALID_PROTOCOL 128 + /* Used to keep whole l2 header for transport mode GRO */ + __u32 orig_mac_len; + __u8 proto; __u8 inner_ipproto; }; |