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-11-15 20:20:09 +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-11-15 20:20:09 +0000 |
| commit | 6a5878a3748d84d95e15b9a8b018e1bfc54fc894 (patch) | |
| tree | 1c5131e29dd469a07090277c82ebb582fb3aa9fa /kernel/include | |
| parent | 4eec8b3824d49c1c0503ebbf7844a4e312bc29e1 (diff) | |
2.4.5
- setlist type does not work properly together with swapping
sets, bug reported by Thomas Jacob.
- Include linux/capability.h explicitly in ip_set.c (Jan Engelhardt)
Diffstat (limited to 'kernel/include')
| -rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set.h | 7 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_setlist.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set.h b/kernel/include/linux/netfilter_ipv4/ip_set.h index c29a460..ec3e59f 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set.h @@ -487,11 +487,12 @@ struct ip_set_hash { /* register and unregister set references */ extern ip_set_id_t ip_set_get_byname(const char name[IP_SET_MAXNAMELEN]); -extern ip_set_id_t ip_set_get_byindex(ip_set_id_t id); -extern void ip_set_put(ip_set_id_t id); +extern ip_set_id_t ip_set_get_byindex(ip_set_id_t index); +extern void ip_set_put_byindex(ip_set_id_t index); +extern ip_set_id_t ip_set_id(ip_set_id_t index); extern ip_set_id_t __ip_set_get_byname(const char name[IP_SET_MAXNAMELEN], struct ip_set **set); -extern void __ip_set_put_byid(ip_set_id_t id); +extern void __ip_set_put_byindex(ip_set_id_t index); /* API for iptables set match, and SET target */ extern int ip_set_addip_kernel(ip_set_id_t id, diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h b/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h index 55f0afb..ca044d8 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_setlist.h @@ -10,7 +10,7 @@ struct ip_set_setlist { uint8_t size; - ip_set_id_t id[0]; + ip_set_id_t index[0]; }; struct ip_set_req_setlist_create { |