[netfilter-cvslog] r4253 - in trunk/conntrack: . src

pablo at netfilter.org pablo at netfilter.org
Wed Aug 31 02:01:37 CEST 2005


Author: pablo at netfilter.org
Date: 2005-08-31 02:01:36 +0200 (Wed, 31 Aug 2005)
New Revision: 4253

Modified:
   trunk/conntrack/ChangeLog
   trunk/conntrack/src/conntrack.c
Log:
Fix ip_conntrack_netlink load-on-demand



Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog	2005-08-30 23:59:05 UTC (rev 4252)
+++ trunk/conntrack/ChangeLog	2005-08-31 00:01:36 UTC (rev 4253)
@@ -1,6 +1,7 @@
 2005-08-31
 <pablo at netfilter.org>
 	o Fix packet and bytes counters (use __be64_to_cpu)
+	o Fix ip_conntrack_netlink load-on-demand
 
 2005-07-12
 <pablo at eurodev.net>

Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-08-30 23:59:05 UTC (rev 4252)
+++ trunk/conntrack/src/conntrack.c	2005-08-31 00:01:36 UTC (rev 4253)
@@ -969,7 +969,7 @@
 			break;
 		}
 		/* Maybe ip_conntrack_netlink isn't insmod'ed */
-		if (res == -1 && retry)
+		if (res < 0 && retry)
 			/* Give it a try just once */
 			iptables_insmod("ip_conntrack_netlink", NULL);
 		else




More information about the netfilter-cvslog mailing list