aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-03-24 05:55:38 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2015-03-25 07:09:39 -0400
commitfce1528ef619bf55bf5e5bca8acaa8a37f0d4202 (patch)
tree0950a42b691aed00aa0850ccc1bcc670758a7b1b
parenta81b2ce8508b9c57c2eae0b0ab7fc8a5e849a4b4 (diff)
netfilter: nf_tables: restore nf_log_trace() in nf_tables_core.c
As described by 4017a7e ("netfilter: restore rule tracing via nfnetlink_log"), this accidentally slipped through during conflict resolution in d5c1d8c. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nf_tables_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index 763a9d87296d..4429008fe99d 100644
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -50,10 +50,10 @@ static void __nft_trace_packet(const struct nft_pktinfo *pkt,
50{ 50{
51 struct net *net = dev_net(pkt->in ? pkt->in : pkt->out); 51 struct net *net = dev_net(pkt->in ? pkt->in : pkt->out);
52 52
53 nf_log_packet(net, pkt->xt.family, pkt->ops->hooknum, pkt->skb, pkt->in, 53 nf_log_trace(net, pkt->xt.family, pkt->ops->hooknum, pkt->skb, pkt->in,
54 pkt->out, &trace_loginfo, "TRACE: %s:%s:%s:%u ", 54 pkt->out, &trace_loginfo, "TRACE: %s:%s:%s:%u ",
55 chain->table->name, chain->name, comments[type], 55 chain->table->name, chain->name, comments[type],
56 rulenum); 56 rulenum);
57} 57}
58 58
59static inline void nft_trace_packet(const struct nft_pktinfo *pkt, 59static inline void nft_trace_packet(const struct nft_pktinfo *pkt,