[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1327269381-20748-4-git-send-email-richard@nod.at>
Date: Sun, 22 Jan 2012 22:56:18 +0100
From: Richard Weinberger <richard@....at>
To: netfilter-devel@...r.kernel.org
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
eric.dumazet@...il.com, jengelh@...ozas.de,
Richard Weinberger <richard@....at>
Subject: [PATCH 3/6] xt_log: Make printk() in sb_close() optional
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@....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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists