diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-03 12:45:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-03 12:45:28 +0100 |
| commit | 8832266dae4f4b401fedce537448bf0cda233b1a (patch) | |
| tree | bc3b3ebf0fecc6e406472ae7b9cbd399bbd1355b /net/xfrm/xfrm_policy.c | |
| parent | f31f012d799cb3a1ab0e99db3694dd5616e59947 (diff) | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
regulator: Merge up fixes
We need these to get the i.MX8 boards working in CI again.
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 475b904fe68b..66e07de2de35 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -3910,15 +3910,10 @@ static void xfrm_link_failure(struct sk_buff *skb) /* Impossible. Such dst must be popped before reaches point of failure. */ } -static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst) +static void xfrm_negative_advice(struct sock *sk, struct dst_entry *dst) { - if (dst) { - if (dst->obsolete) { - dst_release(dst); - dst = NULL; - } - } - return dst; + if (dst->obsolete) + sk_dst_reset(sk); } static void xfrm_init_pmtu(struct xfrm_dst **bundle, int nr) |