diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
| commit | f70925bf99406150d8133e775e49c9c459f78733 (patch) | |
| tree | 392dd3854bf229c0c94b481819e4a67551ba6895 /net/xfrm | |
| parent | 9c8774e629a1950c24b44e3c8fb93d76fb644b49 (diff) | |
| parent | 59f0c2447e2553b0918b4a9fd38763a5c0587d02 (diff) | |
| download | linux-f70925bf99406150d8133e775e49c9c459f78733.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
c8349639324a ("net: lan966x: Add FDMA functionality")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 19aa994f5d2c..00bd0ecff5a1 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -2593,12 +2593,14 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, if (xfrm[i]->props.mode != XFRM_MODE_TRANSPORT) { __u32 mark = 0; + int oif; if (xfrm[i]->props.smark.v || xfrm[i]->props.smark.m) mark = xfrm_smark_get(fl->flowi_mark, xfrm[i]); family = xfrm[i]->props.family; - dst = xfrm_dst_lookup(xfrm[i], tos, fl->flowi_oif, + oif = fl->flowi_oif ? : fl->flowi_l3mdev; + dst = xfrm_dst_lookup(xfrm[i], tos, oif, &saddr, &daddr, family, mark); err = PTR_ERR(dst); if (IS_ERR(dst)) |