From patchwork Thu Jan 17 17:43:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [net-next, 08/11] ipv6: Introduce rt6_nexthop() to select nexthop address. Date: Thu, 17 Jan 2013 07:43:03 -0000 From: =?utf-8?b?WU9TSElGVUpJIEhpZGVha2kgLyDlkInol6Toi7HmmI4gPHlvc2hmdWpp?= =?utf-8?q?=40linux-ipv6=2Eorg=3E?= X-Patchwork-Id: 213337 Message-Id: <50F83827.3000506@linux-ipv6.org> To: davem@davemloft.net, netdev@vger.kernel.org Cc: yoshfuji@linux-ipv6.org, xiyou.wangcong@gmail.com For RTF_GATEWAY route, return rt->rt6i_gateway. Otherwise, return 2nd argument (destination address). This will be used by following patches which remove rt->n dependency patches in ip6_dst_lookup_tail() and ip6_finish_output2(). Signed-off-by: YOSHIFUJI Hideaki --- include/net/ip6_route.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 27d8318..30cbb15 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -23,6 +23,7 @@ struct route_info { #include #include #include +#include #define RT6_LOOKUP_F_IFACE 0x00000001 #define RT6_LOOKUP_F_REACHABLE 0x00000002 @@ -194,4 +195,11 @@ 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) +{ + if (rt->rt6i_flags & RTF_GATEWAY) + return &rt->rt6i_gateway; + return dest; +} + #endif