summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile2
-rw-r--r--ipset.82
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 96d3cce..32b92d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2.2.2
+ - Jiffies rollover bug in ip_set_iptree reported and fixed by Rob Nielsen
+ - Compiler warning in the non-SMP case fixed (Marcus Sundberg)
+ - slab cache names shrunk in order to be compatible with 2.4.* (Marcus
+ Sundberg)
+
2.2.1
- Magic number in ip_set_nethash.h was mistyped (bug reported by Rob
Carlson)
diff --git a/Makefile b/Makefile
index d40ece1..0b72b0e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
KERNEL_DIR=/usr/src/linux
endif
-IPSET_VERSION:=2.2.1
+IPSET_VERSION:=2.2.2
PREFIX:=/usr/local
LIBDIR:=$(PREFIX)/lib
diff --git a/ipset.8 b/ipset.8
index e5c4d82..5e87af2 100644
--- a/ipset.8
+++ b/ipset.8
@@ -313,7 +313,7 @@ where the CIDR block size must be in the inclusive range of 1-31.
In order to avoid clashes in the hash,
double-hashing and, as a last resort, dynamic growing of the hash performed.
.P
-Options to use when creating an iphash set:
+Options to use when creating an nethash set:
.TP
.BR "--hashsize " hashsize
The initial hash size (default 1024)