diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-23 22:22:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-23 22:22:43 -0400 |
| commit | d5c1d8c567781932e3ab2c62e8fcfee0283d9580 (patch) | |
| tree | c04fca1719409426b42af6a7caa75cc26ba940a9 /net/ipv4 | |
| parent | ba7c95ea3870fe7b847466d39a049ab6f156aa2c (diff) | |
| parent | 90a5a895cc8b284ac522757a01de15e36710c2b9 (diff) | |
| download | op-kernel-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.zip op-kernel-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/netfilter/nf_tables_core.c
The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 99e810f..cf5e82f 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -272,9 +272,9 @@ static void trace_packet(const struct sk_buff *skb, &chainname, &comment, &rulenum) != 0) break; - nf_log_packet(net, AF_INET, hook, skb, in, out, &trace_loginfo, - "TRACE: %s:%s:%s:%u ", - tablename, chainname, comment, rulenum); + nf_log_trace(net, AF_INET, hook, skb, in, out, &trace_loginfo, + "TRACE: %s:%s:%s:%u ", + tablename, chainname, comment, rulenum); } #endif |
