From: Pablo Neira Ayuso Date: Tue, 24 Mar 2015 09:55:38 +0000 (+0100) Subject: netfilter: nf_tables: restore nf_log_trace() in nf_tables_core.c X-Git-Tag: firefly_0821_release~176^2~1974^2~128^2~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fce1528ef619bf55bf5e5bca8acaa8a37f0d4202;p=firefly-linux-kernel-4.4.55.git 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 --- 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, { struct net *net = dev_net(pkt->in ? pkt->in : pkt->out); - nf_log_packet(net, pkt->xt.family, pkt->ops->hooknum, pkt->skb, pkt->in, - pkt->out, &trace_loginfo, "TRACE: %s:%s:%s:%u ", - chain->table->name, chain->name, comments[type], - rulenum); + nf_log_trace(net, pkt->xt.family, pkt->ops->hooknum, pkt->skb, pkt->in, + pkt->out, &trace_loginfo, "TRACE: %s:%s:%s:%u ", + chain->table->name, chain->name, comments[type], + rulenum); } static inline void nft_trace_packet(const struct nft_pktinfo *pkt,