From: Richard Weinberger <richard@nod.at>
To: pablo@netfilter.org
Cc: jengelh@medozas.de, eric.dumazet@gmail.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org, rostedt@goodmis.org,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 4/6] xt_log: Make printk() in sb_close() optional
Date: Tue, 6 Mar 2012 00:19:46 +0100 [thread overview]
Message-ID: <1330989588-26833-5-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1330989588-26833-1-git-send-email-richard@nod.at>
Make printk() in sb_close() optional such that other modules
can build a log string without printing it using printk().
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/net/netfilter/xt_log.h | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
index 0dfb34a..767e08d 100644
--- a/include/net/netfilter/xt_log.h
+++ b/include/net/netfilter/xt_log.h
@@ -39,10 +39,12 @@ static struct sbuff *sb_open(void)
return m;
}
-static void sb_close(struct sbuff *m)
+static void __sb_close(struct sbuff *m, int print)
{
- m->buf[m->count] = 0;
- printk("%s\n", m->buf);
+ if (print) {
+ m->buf[m->count] = 0;
+ printk("%s\n", m->buf);
+ }
if (likely(m != &emergency))
kfree(m);
@@ -52,3 +54,4 @@ static void sb_close(struct sbuff *m)
}
}
+#define sb_close(m) __sb_close(m, 1)
--
1.7.7.3
next prev parent reply other threads:[~2012-03-05 23:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 23:19 [PATCH v6] Netfilter ring buffer support Richard Weinberger
2012-03-05 23:19 ` [PATCH 1/6] Netfilter: Merge ipt_LOG and ip6_LOG into xt_LOG Richard Weinberger
2012-03-05 23:19 ` [PATCH 2/6] netfilter: xt_LOG: fix bogus extra layer-4 logging information Richard Weinberger
2012-03-05 23:19 ` [PATCH 3/6] ring_buffer: Export for_each_buffer_cpu() Richard Weinberger
2012-03-05 23:19 ` Richard Weinberger [this message]
2012-03-05 23:19 ` [PATCH 5/6] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-03-06 2:47 ` Steven Rostedt
2012-03-05 23:19 ` [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support Richard Weinberger
2012-03-07 15:29 ` Pablo Neira Ayuso
2012-03-07 15:33 ` Richard Weinberger
2012-03-07 15:40 ` Eric Dumazet
2012-03-08 1:28 ` [PATCH v6] Netfilter ring buffer support Pablo Neira Ayuso
2012-03-08 9:02 ` Richard Weinberger
2012-03-12 13:08 ` Pablo Neira Ayuso
2012-03-12 13:27 ` Richard Weinberger
2012-03-12 14:12 ` Pablo Neira Ayuso
2012-03-12 18:00 ` Richard Weinberger
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=1330989588-26833-5-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=eric.dumazet@gmail.com \
--cc=jengelh@medozas.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=rostedt@goodmis.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).