[PATCH 3/6] xt_log: Make printk() in sb_close() optional
From: Richard Weinberger <richard@nod.at>
Date: 2012-01-22 22:45:00
Also in:
lkml, netfilter-devel
Subsystem:
netfilter, networking [general], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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