[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4A02921A.1090200@cn.fujitsu.com>
Date: Thu, 07 May 2009 15:47:38 +0800
From: Yang Hongyang <yanghy@...fujitsu.com>
To: David Miller <davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
yoshfuji@...ux-ipv6.org
Subject: [PATCH]ipv6:use ipv6_addr_type instead of __ipv6_addr_type
Although the function of these two functions are the same,we should use the
encapsulation function of __ipv6_addr_type
Signed-off-by: Yang Hongyang<yanghy@...fujitsu.com>
---
net/ipv6/addrconf.c | 4 ++--
net/ipv6/datagram.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a8218bc..01b7a83 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1126,7 +1126,7 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
struct net_device *dev;
int dst_type;
- dst_type = __ipv6_addr_type(daddr);
+ dst_type = ipv6_addr_type(daddr);
dst.addr = daddr;
dst.ifindex = dst_dev ? dst_dev->ifindex : 0;
dst.scope = __ipv6_addr_src_scope(dst_type);
@@ -1181,7 +1181,7 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
(!(score->ifa->flags & IFA_F_OPTIMISTIC)))
continue;
- score->addr_type = __ipv6_addr_type(&score->ifa->addr);
+ score->addr_type = ipv6_addr_type(&score->ifa->addr);
if (unlikely(score->addr_type == IPV6_ADDR_ANY ||
score->addr_type & IPV6_ADDR_MULTICAST)) {
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index e2bdc6d..7ea5c77 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -537,7 +537,7 @@ int datagram_send_ctl(struct net *net,
fl->oif = src_info->ipi6_ifindex;
}
- addr_type = __ipv6_addr_type(&src_info->ipi6_addr);
+ addr_type = ipv6_addr_type(&src_info->ipi6_addr);
if (fl->oif) {
dev = dev_get_by_index(net, fl->oif);
--
1.6.0.3
--
Regards
Yang Hongyang
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists