[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <40bae850207de9257479a535ea5ab4e7d1cdeab5.1197432867.git.joe@perches.com>
Date: Thu, 13 Dec 2007 15:38:55 -0800
From: Joe Perches <joe@...ches.com>
To: netdev@...r.kernel.org
Subject: [PATCH net-2.6.25 2/8] include/net: Use ipv4_is_<type>
Signed-off-by: Joe Perches <joe@...ches.com>
---
include/net/addrconf.h | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index c56827d..1c3a560 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -252,10 +252,12 @@ static inline int ipv6_addr_is_ll_all_routers(const struct in6_addr *addr)
static inline int ipv6_isatap_eui64(u8 *eui, __be32 addr)
{
- eui[0] = (ZERONET(addr) || PRIVATE_10(addr) || LOOPBACK(addr) ||
- LINKLOCAL_169(addr) || PRIVATE_172(addr) || TEST_192(addr) ||
- ANYCAST_6TO4(addr) || PRIVATE_192(addr) || TEST_198(addr) ||
- MULTICAST(addr) || BADCLASS(addr)) ? 0x00 : 0x02;
+ eui[0] = (ipv4_is_zeronet(addr) || ipv4_is_private_10(addr) ||
+ ipv4_is_loopback(addr) || ipv4_is_linklocal_169(addr) ||
+ ipv4_is_private_172(addr) || ipv4_is_test_192(addr) ||
+ ipv4_is_anycast_6to4(addr) || ipv4_is_private_192(addr) ||
+ ipv4_is_test_198(addr) || ipv4_is_multicast(addr) ||
+ ipv4_is_badclass(addr)) ? 0x00 : 0x02;
eui[1] = 0;
eui[2] = 0x5E;
eui[3] = 0xFE;
--
1.5.3.7.949.g2221a6
--
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