diff options
author | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2008-10-23 17:24:30 +0000 |
---|---|---|
committer | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2008-10-23 17:24:30 +0000 |
commit | 46fb717308d9d717439badd48c150e32a3508a90 (patch) | |
tree | 3a6e1fcaca1b4b7e9a4e8353bb3f3b3db0f2c737 /kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h | |
parent | fac5288ad80b7ca2f23d1d5acf6ced98a61fd8eb (diff) |
ipset 2.4.2:
- When flushing a nethash/ipportnethash type of set, it can
lead to a kernel crash due to a wrong type declaration,
bug reported by Krzysztof Oledzki.
- iptree and iptreemap types require the header file linux/timer.h,
also reported by Krzysztof Oledzki.
Diffstat (limited to 'kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h')
-rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h index ccec14e..b5db5f5 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_ipporthash.h @@ -2,6 +2,7 @@ #define __IP_SET_IPPORTHASH_H #include <linux/netfilter_ipv4/ip_set.h> +#include <linux/netfilter_ipv4/ip_set_hashes.h> #define SETTYPE_NAME "ipporthash" @@ -13,7 +14,7 @@ struct ip_set_ipporthash { uint16_t resize; /* resize factor in percent */ ip_set_ip_t first_ip; /* host byte order, included in range */ ip_set_ip_t last_ip; /* host byte order, included in range */ - uint32_t initval[0]; /* initvals for jhash_1word */ + initval_t initval[0]; /* initvals for jhash_1word */ }; struct ip_set_req_ipporthash_create { |