From 7dd4cbe69134fda8f822c4a917ae49b55db524f6 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@inl.fr>
Date: Wed, 18 Feb 2009 15:29:23 +0100
Subject: [PATCH] --- yaml --- r: 131943 b: refs/heads/master c:
 5ca431f9ae8db8c6edb9c64bebe6d6521077afd6 h: refs/heads/master i:   131941:
 ef9f2241bb65a16ac3e2eea5fd4d79d8c3ef1064   131939:
 df439fe792eef7fe46622120674c204d9a3c8aae   131935:
 4a550c66f082bd524bfea3d0ab8ad641a7625c1a v: v3

---
 [refs]                                   | 2 +-
 trunk/include/linux/netfilter/xt_NFLOG.h | 2 +-
 trunk/net/netfilter/nfnetlink_log.c      | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 39e541281286..1eaa67f8c4e5 100644
--- 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
index cdcd0ed58f7a..4b36aeb46a10 100644
--- 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
index fa49dc7fe100..580b837e44dd 100644
--- 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: