diff options
author | David S. Miller <davem@davemloft.net> | 2016-05-10 02:33:53 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-10 02:33:53 (GMT) |
commit | 20e61335d8db0caf0c50236c1c9c2ea546f61f1a (patch) | |
tree | f82066e771ed276e9b9eb5f93b5b0f28ca1061a2 /net/ipv6 | |
parent | 27c0f739a009971aaf43ee71d9b150a56ee57012 (diff) | |
parent | 1ff23beebdd315fe4d16070c08c065e89d7debb3 (diff) | |
download | linux-20e61335d8db0caf0c50236c1c9c2ea546f61f1a.tar.xz |
Merge branch 'l3mdev-send-enslaved'
David Ahern says:
====================
net: l3mdev: Allow send on enslaved interface
First patch preps for the second. The second is required for several use
cases such as ping on an interface and BFD that need to send packets on
a specific interface, including ones enslaved to a VRF device.
v2
- fixed brackets on both patches per comment from DaveM
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index af46e19..c42fa1d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1190,7 +1190,7 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk, struct dst_entry *dst; bool any_src; - dst = l3mdev_rt6_dst_by_oif(net, fl6); + dst = l3mdev_get_rt6_dst(net, fl6); if (dst) return dst; |