git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
net
/
addrconf.h
diff --git
a/include/net/addrconf.h
b/include/net/addrconf.h
index
fc2b279
..
4928cfd
100644
(file)
--- a/
include/net/addrconf.h
+++ b/
include/net/addrconf.h
@@
-160,8
+160,8
@@
static inline void in6_ifa_put(struct inet6_ifaddr *ifp)
inet6_ifa_finish_destroy(ifp);
}
inet6_ifa_finish_destroy(ifp);
}
-#define __in6_ifa_put(i
fp) atomic_dec(&(ifp
)->refcnt)
-#define in6_ifa_hold(i
fp) atomic_inc(&(ifp
)->refcnt)
+#define __in6_ifa_put(i
dev) atomic_dec(&(idev
)->refcnt)
+#define in6_ifa_hold(i
dev) atomic_inc(&(idev
)->refcnt)
extern void addrconf_forwarding_on(void);
extern void addrconf_forwarding_on(void);
@@
-178,8
+178,8
@@
static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
* This will include the IEEE address token on links that support it.
*/
* This will include the IEEE address token on links that support it.
*/
- word = addr->s6_addr
32
[2] ^ addr->s6_addr32[3];
- word
^= (word >>
16);
+ word = addr->s6_addr[2] ^ addr->s6_addr32[3];
+ word
^= (word>>
16);
word ^= (word >> 8);
return ((word ^ (word >> 4)) & 0x0f);
word ^= (word >> 8);
return ((word ^ (word >> 4)) & 0x0f);