From 6a5878a3748d84d95e15b9a8b018e1bfc54fc894 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Sat, 15 Nov 2008 20:20:09 +0000 Subject: 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) --- kernel/include/linux/netfilter_ipv4/ip_set.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel/include/linux/netfilter_ipv4/ip_set.h') 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, -- cgit v1.2.3