netfilter: nf_conntrack: Uses pr_fmt() for logging.
Subsystems (2)
PATCH 1/1 netfilter: nf_conntrack: Uses pr_fmt() for logging.
Uses pr_fmt() macro for debugging messages of nf_conntrack module.
Signed-off-by Weongyo Jeong <[email protected]>
--- net/netfilter/nf_conntrack_core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/netfilter/nf_conntrack_core.c +8 -7
@@ -12,6 +12,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/types.h> #include <linux/netfilter.h> #include <linux/module.h>
@@ -968,7 +970,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,if (!l4proto->new (ct, skb, dataoff, timeouts)) {nf_conntrack_free (ct); -pr_debug ("init conntrack: can't track with proto module\n" ); +pr_debug ("can't track with proto module\n" );return NULL ; }
@@ -990,7 +992,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,spin_lock (&nf_conntrack_expect_lock); exp =nf_ct_find_expectation (net, zone, tuple);if (exp) { -pr_debug ("conntrack: expectation arrives ct=%p exp=%p\n" , +pr_debug ("expectation arrives ct=%p exp=%p\n" , ct, exp);/* Welcome, Mr. Bond. We've been expecting you... */ __set_bit (IPS_EXPECTED_BIT , &ct->status);
@@ -1055,7 +1057,7 @@ resolve_normal_ct(struct net *net, struct nf_conn *tmpl,if (!nf_ct_get_tuple (skb,skb_network_offset (skb), dataoff, l3num, protonum, net, &tuple, l3proto, l4proto)) { -pr_debug ("resolve_normal_ct: Can't get tuple\n" ); +pr_debug ("Can't get tuple\n" );return NULL ; }
@@ -1081,14 +1083,13 @@ resolve_normal_ct(struct net *net, struct nf_conn *tmpl, }else {/* Once we've had two way comms, always ESTABLISHED. */ if (test_bit (IPS_SEEN_REPLY_BIT , &ct->status)) { -pr_debug ("nf_conntrack_in: normal packet for %p\n" , ct); +pr_debug ("normal packet for %p\n" , ct); *ctinfo =IP_CT_ESTABLISHED ; }else if (test_bit (IPS_EXPECTED_BIT , &ct->status)) { -pr_debug ("nf_conntrack_in: related packet for %p\n" , - ct); +pr_debug ("related packet for %p\n" , ct); *ctinfo =IP_CT_RELATED ; }else { -pr_debug ("nf_conntrack_in: new packet for %p\n" , ct); +pr_debug ("new packet for %p\n" , ct); *ctinfo =IP_CT_NEW ; } *set_reply =0 ;
Signature · 1 line
2.1.3
Quoted 1 line · Weongyo Jeong
Uses
pr_fmt()macro for debugging messages ofnf_conntrackmodule.
Applied, thanks.