Message ID | e75f48a6fc4fec77bee34ee702a2f2a3927b7279.1657260947.git.antony.antony@secunet.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [ipsec-next,1/4] Revert "xfrm: update SA curlft.use_time" | expand |
On Fri, Jul 08, 2022 at 08:18:18AM +0200, Antony Antony wrote: > migrate x->lastused xfrm_do_migrate. It was not in the original commit Is the commit message intentional like this? It reads a bit odd :) > Signed-off-by: Antony Antony <antony.antony@secunet.com> > --- > net/xfrm/xfrm_state.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > index 03b180878e61..712b6d46f8ee 100644 > --- a/net/xfrm/xfrm_state.c > +++ b/net/xfrm/xfrm_state.c > @@ -1592,6 +1592,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, > x->replay = orig->replay; > x->preplay = orig->preplay; > x->mapping_maxage = orig->mapping_maxage; > + x->lastused = orig->lastused; We lose lastused when cloning a state, so this one is a fix too. Please submit to the ipsec tree with a proper 'Fixes' tag. Thanks!
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 03b180878e61..712b6d46f8ee 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1592,6 +1592,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->replay = orig->replay; x->preplay = orig->preplay; x->mapping_maxage = orig->mapping_maxage; + x->lastused = orig->lastused; x->new_mapping = 0; x->new_mapping_sport = 0;
migrate x->lastused xfrm_do_migrate. It was not in the original commit Signed-off-by: Antony Antony <antony.antony@secunet.com> --- net/xfrm/xfrm_state.c | 1 + 1 file changed, 1 insertion(+)