From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wangyufen Subject: [PATCH net-next v6 2/3] ipv6: reuse rt6_need_strict Date: Sat, 29 Mar 2014 09:27:30 +0800 Message-ID: <1396056451-5600-3-git-send-email-wangyufen@huawei.com> References: <1396056451-5600-1-git-send-email-wangyufen@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Wang Yufen To: , Return-path: Received: from szxga02-in.huawei.com ([119.145.14.65]:17330 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751455AbaC2B1r (ORCPT ); Fri, 28 Mar 2014 21:27:47 -0400 In-Reply-To: <1396056451-5600-1-git-send-email-wangyufen@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Wang Yufen Move the whole rt6_need_strict as static inline into ip6_route.h, so that it can be reused Signed-off-by: Wang Yufen --- include/net/ip6_route.h | 5 +++++ net/ipv6/route.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 00e3f12..33e8694 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -51,6 +51,11 @@ static inline unsigned int rt6_flags2srcprefs(int flags) return (flags >> 3) & 7; } +static inline bool rt6_need_strict(const struct in6_addr *daddr) +{ + return ipv6_addr_type(daddr) & + (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK); +} void ip6_route_input(struct sk_buff *skb); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b93ae6a..5015c50 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -374,12 +374,6 @@ static bool rt6_check_expired(const struct rt6_info *rt) return false; } -static bool rt6_need_strict(const struct in6_addr *daddr) -{ - return ipv6_addr_type(daddr) & - (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK); -} - /* Multipath route selection: * Hash based function using packet header and flowlabel. * Adapted from fib_info_hashfn() -- 1.7.12