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_bitmaps.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_bitmaps.h')
-rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h index 916cb80..2e9293f 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h @@ -3,6 +3,7 @@ /* Macros to generate functions */ +#ifdef __KERNEL__ #define BITMAP_CREATE(type) \ static int \ type##_create(struct ip_set *set, const void *data, size_t size) \ @@ -115,5 +116,6 @@ struct ip_set_type ip_set_##type = { \ .list_members = &type##_list_members, \ .me = THIS_MODULE, \ }; +#endif /* __KERNEL */ #endif /* __IP_SET_BITMAPS_H */ |