diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-07-19 20:36:15 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-19 20:36:16 -0700 |
| commit | 567b12fe7c7ed9d0de58227e8ada15aa3fce3c4c (patch) | |
| tree | b8e2496458d95ec9c370b0c1e7faa27e6be787a4 | |
| parent | e93165d5e75d025280763ff01eece98575b32901 (diff) | |
| parent | a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 (diff) | |
| download | linux-567b12fe7c7ed9d0de58227e8ada15aa3fce3c4c.tar.gz linux-567b12fe7c7ed9d0de58227e8ada15aa3fce3c4c.tar.bz2 linux-567b12fe7c7ed9d0de58227e8ada15aa3fce3c4c.zip | |
Merge tag 'ipsec-next-2023-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2023-07-19
Just a leftover from the last development cycle:
1) delete a clear to zero of encap_oa, it is not needed anymore.
From Leon Romanovsky.
* tag 'ipsec-next-2023-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next:
xfrm: delete not-needed clear to zero of encap_oa
====================
Link: https://lore.kernel.org/r/20230719100228.373055-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/key/af_key.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index ede3c6a60353..542439b6a59c 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1281,7 +1281,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1]; natt->encap_dport = n_port->sadb_x_nat_t_port_port; } - memset(&natt->encap_oa, 0, sizeof(natt->encap_oa)); } err = xfrm_init_state(x); |