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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ip_set_iptree.h
diff --git
a/include/linux/netfilter_ipv4/ip_set_iptree.h
b/include/linux/netfilter_ipv4/ip_set_iptree.h
index
54142a7
..
64e716b
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_set_iptree.h
+++ b/
include/linux/netfilter_ipv4/ip_set_iptree.h
@@
-22,6
+22,7
@@
struct ip_set_iptree {
unsigned int timeout;
unsigned int gc_interval;
#ifdef __KERNEL__
+ uint32_t elements; /* number of elements */
struct timer_list gc;
struct ip_set_iptreeb *tree[256]; /* ADDR.*.*.* */
#endif