aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorDavid Ahern <dsa@cumulusnetworks.com>2016-09-10 15:09:59 -0400
committerDavid S. Miller <davem@davemloft.net>2016-09-11 02:12:53 -0400
commit8a966fc016b67d2a8ab4a83d22ded8cde032a0eb (patch)
tree2cbab40ee68d47275ac7cf583ab1a5197bd6bd96 /net/ipv6/ip6_output.c
parentd66f6c0a8f3c0bcc4ee7a9b1da4b0ebe7ee555a3 (diff)
net: ipv6: Remove l3mdev_get_saddr6
No longer needed Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 1cb41b365048..6001e781164e 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -926,13 +926,6 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
926 int err; 926 int err;
927 int flags = 0; 927 int flags = 0;
928 928
929 if (ipv6_addr_any(&fl6->saddr) && fl6->flowi6_oif &&
930 (!*dst || !(*dst)->error)) {
931 err = l3mdev_get_saddr6(net, sk, fl6);
932 if (err)
933 goto out_err;
934 }
935
936 /* The correct way to handle this would be to do 929 /* The correct way to handle this would be to do
937 * ip6_route_get_saddr, and then ip6_route_output; however, 930 * ip6_route_get_saddr, and then ip6_route_output; however,
938 * the route-specific preferred source forces the 931 * the route-specific preferred source forces the
@@ -1024,7 +1017,7 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
1024out_err_release: 1017out_err_release:
1025 dst_release(*dst); 1018 dst_release(*dst);
1026 *dst = NULL; 1019 *dst = NULL;
1027out_err: 1020
1028 if (err == -ENETUNREACH) 1021 if (err == -ENETUNREACH)
1029 IP6_INC_STATS(net, NULL, IPSTATS_MIB_OUTNOROUTES); 1022 IP6_INC_STATS(net, NULL, IPSTATS_MIB_OUTNOROUTES);
1030 return err; 1023 return err;