From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 13 Dec 2010 11:40:06 +0000 (+0100)
Subject: Remove remnants of slist from ip_set_ahash.h
X-Git-Tag: v5.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfe98c9a41236630a405ad1e34b3cd7cf8056b55;p=thirdparty%2Fipset.git

Remove remnants of slist from ip_set_ahash.h
---

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
index 28ee1c1b..7bb41132 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -3,7 +3,6 @@
 
 #include <linux/rcupdate.h>
 #include <linux/netfilter/ipset/jhash.h>
-#include <linux/netfilter/ipset/slist.h>
 #include <linux/netfilter/ipset/ip_set_timeout.h>
 
 /* Hashing which uses arrays to resolve clashing. The hash table is resized
@@ -552,9 +551,9 @@ type_pf_list(struct ip_set *set,
 		printk("cb->args[2]: %lu, t %p n %p\n", cb->args[2], t, n); 
 		for (i = 0; i < n->pos; i++) {
 			data = ahash_data(n, i);
-			printk("list hash %lu slist %p i %u, data %p",
+			printk("list hash %lu hbucket %p i %u, data %p",
 				 cb->args[2], n, i, data);
-			pr_debug("list hash %lu slist %p i %u",
+			pr_debug("list hash %lu hbucket %p i %u",
 				 cb->args[2], n, i);
 			nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
 			if (!nested) {