net: l3mdev: remove redundant calls

[cascardo/linux.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 87e0a01..ad4a7ff 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1164,7 +1164,7 @@ void ip6_route_input(struct sk_buff *skb)
        int flags = RT6_LOOKUP_F_HAS_SADDR;
        struct ip_tunnel_info *tun_info;
        struct flowi6 fl6 = {
-               .flowi6_iif = l3mdev_fib_oif(skb->dev),
+               .flowi6_iif = skb->dev->ifindex,
                .daddr = iph->daddr,
                .saddr = iph->saddr,
                .flowlabel = ip6_flowinfo(iph),
@@ -3349,11 +3349,6 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        } else {
                fl6.flowi6_oif = oif;
 
-               if (netif_index_is_l3_master(net, oif)) {
-                       fl6.flowi6_flags = FLOWI_FLAG_L3MDEV_SRC |
-                                          FLOWI_FLAG_SKIP_NH_OIF;
-               }
-
                rt = (struct rt6_info *)ip6_route_output(net, NULL, &fl6);
        }