diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
| commit | b20b378d49926b82c0a131492fa8842156e0e8a9 (patch) | |
| tree | 7196847eea049a46442b05f99aee1dc571019381 /net/ipv6/xfrm6_policy.c | |
| parent | 02154927c115c7599677df57203988e05b576346 (diff) | |
| parent | da499f8f5385c181e29978fdaab15a58de185302 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig
All conflicts were cases of overlapping commits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index b7b7e863a2bb..e0f71c01d728 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -36,7 +36,7 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif, int err; memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_oif = oif; + fl6.flowi6_oif = l3mdev_master_ifindex_by_index(net, oif); fl6.flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF; memcpy(&fl6.daddr, daddr, sizeof(fl6.daddr)); if (saddr) |