aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-10-04 16:17:53 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-05 03:47:39 -0400
commitc61393ea83573ff422af505b6fd49ef9ec9b91ca (patch)
tree4dbaf967e7293618205622776d553e37ec0a2f3e
parent1df9916e46451533463f227e6be57cc2cfca4c5f (diff)
ipv6: make __ipv6_isatap_ifid static
Another exported symbol only used in one file Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/addrconf.h2
-rw-r--r--net/ipv6/addrconf.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 958d2749b7a9..a9441249306c 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -276,8 +276,6 @@ static inline int ipv6_addr_is_ll_all_routers(const struct in6_addr *addr)
276 (addr->s6_addr32[3] ^ htonl(0x00000002))) == 0; 276 (addr->s6_addr32[3] ^ htonl(0x00000002))) == 0;
277} 277}
278 278
279extern int __ipv6_isatap_ifid(u8 *eui, __be32 addr);
280
281static inline int ipv6_addr_is_isatap(const struct in6_addr *addr) 279static inline int ipv6_addr_is_isatap(const struct in6_addr *addr)
282{ 280{
283 return (addr->s6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE); 281 return (addr->s6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8c88340278f5..ec7a91d9e865 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1544,7 +1544,7 @@ static int addrconf_ifid_infiniband(u8 *eui, struct net_device *dev)
1544 return 0; 1544 return 0;
1545} 1545}
1546 1546
1547int __ipv6_isatap_ifid(u8 *eui, __be32 addr) 1547static int __ipv6_isatap_ifid(u8 *eui, __be32 addr)
1548{ 1548{
1549 if (addr == 0) 1549 if (addr == 0)
1550 return -1; 1550 return -1;
@@ -1560,7 +1560,6 @@ int __ipv6_isatap_ifid(u8 *eui, __be32 addr)
1560 memcpy(eui + 4, &addr, 4); 1560 memcpy(eui + 4, &addr, 4);
1561 return 0; 1561 return 0;
1562} 1562}
1563EXPORT_SYMBOL(__ipv6_isatap_ifid);
1564 1563
1565static int addrconf_ifid_sit(u8 *eui, struct net_device *dev) 1564static int addrconf_ifid_sit(u8 *eui, struct net_device *dev)
1566{ 1565{