diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-04 15:18:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-04 15:18:54 -0400 |
commit | 9a1b9496cd2b013f74885218947fa7120d53e74c (patch) | |
tree | a48d2fdf14a7445a15a7553ef8b7a8732b5bcac1 /net/ipv4/route.c | |
parent | dd927a2694ee412b440284dd72dd8e32caada3fc (diff) |
ipv4: Pass explicit saddr/daddr args to ipmr_get_route().
This eliminates the need to use rt->rt_{src,dst}.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 3bc685454b5b..6a83840b16af 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2857,7 +2857,9 @@ static int rt_fill_info(struct net *net, | |||
2857 | 2857 | ||
2858 | if (ipv4_is_multicast(dst) && !ipv4_is_local_multicast(dst) && | 2858 | if (ipv4_is_multicast(dst) && !ipv4_is_local_multicast(dst) && |
2859 | IPV4_DEVCONF_ALL(net, MC_FORWARDING)) { | 2859 | IPV4_DEVCONF_ALL(net, MC_FORWARDING)) { |
2860 | int err = ipmr_get_route(net, skb, r, nowait); | 2860 | int err = ipmr_get_route(net, skb, |
2861 | rt->rt_src, rt->rt_dst, | ||
2862 | r, nowait); | ||
2861 | if (err <= 0) { | 2863 | if (err <= 0) { |
2862 | if (!nowait) { | 2864 | if (!nowait) { |
2863 | if (err == 0) | 2865 | if (err == 0) |