aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-02-28 03:03:12 -0500
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-04 01:18:23 -0500
commit0e7b8dcd16eb91b9cd8ecc07c4094512f20d7e3c (patch)
treed25ec8b94b5be494bd9b1ec692eefc671d09b12d
parent5ee091050986796856cc6207d86b38b4ef6bd8f4 (diff)
[IPV6]: Use htonl() instead of __constant_htonl() where appricable.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-rw-r--r--include/net/addrconf.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 496503c0384..a9ff97c120c 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -214,29 +214,25 @@ static inline void addrconf_addr_solict_mult(const struct in6_addr *addr,
214 struct in6_addr *solicited) 214 struct in6_addr *solicited)
215{ 215{
216 ipv6_addr_set(solicited, 216 ipv6_addr_set(solicited,
217 __constant_htonl(0xFF020000), 0, 217 htonl(0xFF020000), 0,
218 __constant_htonl(0x1), 218 htonl(0x1),
219 __constant_htonl(0xFF000000) | addr->s6_addr32[3]); 219 htonl(0xFF000000) | addr->s6_addr32[3]);
220} 220}
221 221
222 222
223static inline void ipv6_addr_all_nodes(struct in6_addr *addr) 223static inline void ipv6_addr_all_nodes(struct in6_addr *addr)
224{ 224{
225 ipv6_addr_set(addr, 225 ipv6_addr_set(addr, htonl(0xFF020000), 0, 0, htonl(0x1));
226 __constant_htonl(0xFF020000), 0, 0,
227 __constant_htonl(0x1));
228} 226}
229 227
230static inline void ipv6_addr_all_routers(struct in6_addr *addr) 228static inline void ipv6_addr_all_routers(struct in6_addr *addr)
231{ 229{
232 ipv6_addr_set(addr, 230 ipv6_addr_set(addr, htonl(0xFF020000), 0, 0, htonl(0x2));
233 __constant_htonl(0xFF020000), 0, 0,
234 __constant_htonl(0x2));
235} 231}
236 232
237static inline int ipv6_addr_is_multicast(const struct in6_addr *addr) 233static inline int ipv6_addr_is_multicast(const struct in6_addr *addr)
238{ 234{
239 return (addr->s6_addr32[0] & __constant_htonl(0xFF000000)) == __constant_htonl(0xFF000000); 235 return (addr->s6_addr32[0] & htonl(0xFF000000)) == htonl(0xFF000000);
240} 236}
241 237
242static inline int ipv6_addr_is_ll_all_nodes(const struct in6_addr *addr) 238static inline int ipv6_addr_is_ll_all_nodes(const struct in6_addr *addr)