Skip to content

Commit 567b12f

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents e93165d + a94fd40 commit 567b12f

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

net/key/af_key.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
12811281
ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1];
12821282
natt->encap_dport = n_port->sadb_x_nat_t_port_port;
12831283
}
1284-
memset(&natt->encap_oa, 0, sizeof(natt->encap_oa));
12851284
}
12861285

12871286
err = xfrm_init_state(x);

0 commit comments

Comments
 (0)