Manpage extended with a few words to explain iptree type of sets

and timing out entries.

diff --git a/ChangeLog b/ChangeLog
index 50ae5ed899e80bbd5aa61598cf41c8665ba61a6c..d76ded834f6c093f2ac15b02b3ffd442a136b190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2.2.6
+ - memory allocation in iptree is changed to GFP_ATOMIC because
+   we hold a lock (bug reported by Radek Hladik)
+ - compatibility fix: __nocast is not defined in all 2.6 branches
+   (problem reported by Ming-Ching Tiew)
+ - manpage corrections
+
 2.2.5
  - garbage collector of iptree type of sets is fixed: flushing
    sets/removing kernel module could corrupt the timer
  - new ipporthash type added
  - manpage fixes and corrections
+
 2.2.4
  - half-fixed memory allocation bug in iphash and nethash finally
    completely fixed (bug reported by Nikolai Malykh)

diff --git a/Makefile b/Makefile
index 970da6cdb67c4fc3c9eec294e4d8404185a0953f..5f4623f535f44e5816a8883cb662f7b8dac1cd18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.2.5
+IPSET_VERSION:=2.2.6
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

diff --git a/ipset.8 b/ipset.8
index 3dcef3c087ac02315f6c506079230cbf3004b631..89a86ce859ca2934a1390f645190a1b2307b196e 100644 (file)
--- a/ipset.8
+++ b/ipset.8
@@ -412,8 +412,10 @@ Options to use when creating an iptree set:
 .BR "--timeout " value
 The timeout value for the entries in seconds (default 0)
 .P
-When adding an IP address to a set, one may add it with a specific timeout 
-value using the syntax 
+If a set was created with a nonzero valued 
+.B "--timeout"
+parameter then one may add IP addresses to the set with a specific 
+timeout value using the syntax 
 .I IP%timeout-value.
 .SH GENERAL RESTRICTIONS
 Setnames starting with colon (:) cannot be defined. Zero valued set