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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
net
/
if_inet6.h
diff --git
a/include/net/if_inet6.h
b/include/net/if_inet6.h
index
eb8afe3
..
3ec7d07
100644
(file)
--- a/
include/net/if_inet6.h
+++ b/
include/net/if_inet6.h
@@
-152,6
+152,7
@@
struct ifacaddr6
struct ipv6_devstat {
struct proc_dir_entry *proc_dir_entry;
struct ipv6_devstat {
struct proc_dir_entry *proc_dir_entry;
+ DEFINE_SNMP_STAT(struct ipstats_mib, ipv6);
DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6);
};
DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6);
};
@@
-180,11
+181,8
@@
struct inet6_dev
#ifdef CONFIG_IPV6_PRIVACY
u8 rndid[8];
#ifdef CONFIG_IPV6_PRIVACY
u8 rndid[8];
- u8 entropy[8];
struct timer_list regen_timer;
struct inet6_ifaddr *tempaddr_list;
struct timer_list regen_timer;
struct inet6_ifaddr *tempaddr_list;
- __u8 work_eui64[8];
- __u8 work_digest[16];
#endif
struct neigh_parms *nd_parms;
#endif
struct neigh_parms *nd_parms;
@@
-192,6
+190,7
@@
struct inet6_dev
struct ipv6_devconf cnf;
struct ipv6_devstat stats;
unsigned long tstamp; /* ipv6InterfaceTable update timestamp */
struct ipv6_devconf cnf;
struct ipv6_devstat stats;
unsigned long tstamp; /* ipv6InterfaceTable update timestamp */
+ struct rcu_head rcu;
};
extern struct ipv6_devconf ipv6_devconf;
};
extern struct ipv6_devconf ipv6_devconf;