diff options
author | Julian Anastasov <ja@ssi.bg> | 2013-10-20 15:43:04 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-04 04:35:18 -0800 |
commit | 3125f8ba70a008cd14251eafbd22b5d23d90edf2 (patch) | |
tree | 97d7ba203ce334eff8998a66cd24627d74b0466b /include | |
parent | 0c80c90ad1632d30f310d5b6f5397ef3eba245d6 (diff) |
ipv6: fill rt6i_gateway with nexthop address
[ Upstream commit 550bab42f83308c9d6ab04a980cc4333cef1c8fa ]
Make sure rt6i_gateway contains nexthop information in
all routes returned from lookup or when routes are directly
attached to skb for generated ICMP packets.
The effect of this patch should be a faster version of
rt6_nexthop() and the consideration of local addresses as
nexthop.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/ip6_route.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 0aaf0ec24ac2..c7b8860f29fd 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -196,11 +196,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb) skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); } -static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest) +static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt) { - if (rt->rt6i_flags & RTF_GATEWAY || !ipv6_addr_any(&rt->rt6i_gateway)) - return &rt->rt6i_gateway; - return dest; + return &rt->rt6i_gateway; } #endif |