---

yaml --- r: 131943 b: refs/heads/master c: 5ca431f h: refs/heads/master i: 131941: ef9f224 131939: df439fe 131935: 4a550c6 v: v3
git-mirror · Feb 18, 2009 · 7dd4cbe · 7dd4cbe
1 parent 447d54a
commit 7dd4cbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aa3b2ee1945ed082430ae1fb988d60eef64ca07
+refs/heads/master: 5ca431f9ae8db8c6edb9c64bebe6d6521077afd6
diff --git a/trunk/include/linux/netfilter/xt_NFLOG.h b/trunk/include/linux/netfilter/xt_NFLOG.h
@@ -2,7 +2,7 @@
 #define _XT_NFLOG_TARGET
 
 #define XT_NFLOG_DEFAULT_GROUP		0x1
-#define XT_NFLOG_DEFAULT_THRESHOLD	1
+#define XT_NFLOG_DEFAULT_THRESHOLD	0
 
 #define XT_NFLOG_MASK			0x0
 

diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c
@@ -590,8 +590,10 @@ nfulnl_log_packet(u_int8_t pf,
 
 	qthreshold = inst->qthreshold;
 	/* per-rule qthreshold overrides per-instance */
-	if (qthreshold > li->u.ulog.qthreshold)
-		qthreshold = li->u.ulog.qthreshold;
+	if (li->u.ulog.qthreshold)
+		if (qthreshold > li->u.ulog.qthreshold)
+			qthreshold = li->u.ulog.qthreshold;
+
 
 	switch (inst->copy_mode) {
 	case NFULNL_COPY_META: