Revert "xfrm: Pass flowi_oif or l3mdev as oif to xfrm_dst_lookup"
This reverts commit 40dbfea1fd
.
This commit is contained in:
parent
7b92e2530c
commit
6a7d749ef9
1 changed files with 1 additions and 3 deletions
|
@ -2628,14 +2628,12 @@ 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;
|
||||
oif = fl->flowi_oif ? : fl->flowi_l3mdev;
|
||||
dst = xfrm_dst_lookup(xfrm[i], tos, oif,
|
||||
dst = xfrm_dst_lookup(xfrm[i], tos, fl->flowi_oif,
|
||||
&saddr, &daddr, family, mark);
|
||||
err = PTR_ERR(dst);
|
||||
if (IS_ERR(dst))
|
||||
|
|
Loading…
Reference in a new issue