From: Eric Leblond <eric@inl.fr>
To: netfilter-devel@vger.kernel.org
Cc: Eric Leblond <eric@inl.fr>
Subject: [PATCH 2/2] netfilter: fix nflog timeout handling
Date: Fri, 30 Jan 2009 23:31:48 +0100 [thread overview]
Message-ID: <1233354708-22009-4-git-send-email-eric@inl.fr> (raw)
In-Reply-To: <1233354708-22009-1-git-send-email-eric@inl.fr>
NFLOG timeout was computed in timer by doing:
flushtimeout*HZ/100
Default value of flushtimeout was HZ (for 1 second delay). This was
wrong for non 100HZ computer.
This patch modifies the delay computation by using:
flushtimeout*HZ/1000
delay and set default value of flushtimeout to 1000 (as 1/100 sec is not
a common unit).
Signed-off-by: Eric Leblond <eric@inl.fr>
---
net/netfilter/nfnetlink_log.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 88b455e..b5086fa 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -39,7 +39,7 @@
#endif
#define NFULNL_NLBUFSIZ_DEFAULT NLMSG_GOODSIZE
-#define NFULNL_TIMEOUT_DEFAULT HZ /* every second */
+#define NFULNL_TIMEOUT_DEFAULT 1000 /* every second */
#define NFULNL_QTHRESH_DEFAULT 100 /* 100 packets */
#define NFULNL_COPY_RANGE_MAX 0xFFFF /* max packet size is limited by 16-bit struct nfattr nfa_len field */
@@ -639,7 +639,7 @@ nfulnl_log_packet(u_int8_t pf,
* is no chance of a race here */
else if (!timer_pending(&inst->timer)) {
instance_get(inst);
- inst->timer.expires = jiffies + (inst->flushtimeout*HZ/100);
+ inst->timer.expires = jiffies + (inst->flushtimeout*HZ/1000);
add_timer(&inst->timer);
}
--
1.6.1
next prev parent reply other threads:[~2009-01-30 22:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-30 22:31 Add real default to NFLOG qthreshold Eric Leblond
2009-01-30 22:31 ` [PATCH 1/2] netfilter: if set per-rule qthreshold overrides per-instance Eric Leblond
2009-02-09 17:33 ` Patrick McHardy
2009-01-30 22:31 ` [iptables] xt_NFLOG: Set default NFLOG qthreshold to 0 Eric Leblond
2009-02-09 17:34 ` Patrick McHardy
2009-01-30 22:31 ` Eric Leblond [this message]
2009-02-09 17:37 ` [PATCH 2/2] netfilter: fix nflog timeout handling Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1233354708-22009-4-git-send-email-eric@inl.fr \
--to=eric@inl.fr \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).