From f25039dbf05e48b326fd82ad3c6b56e674f933bb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Nov 2010 11:23:06 +0100 Subject: [PATCH] --- yaml --- r: 236563 b: refs/heads/master c: b468645d72c2b4a15512f0a18e77670ea058b861 h: refs/heads/master i: 236561: 3dda7e5becc1a8fc23b28a2ee289c5afd2b56426 236559: 3ac9d736de4332165052f137ee3546de292b2cf0 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ipt_LOG.c | 3 +-- trunk/net/ipv6/netfilter/ip6t_LOG.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7d75e3006c0e..f26335586eea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca36181050a523f6c0af3ef7cb509bbbc4ede276 +refs/heads/master: b468645d72c2b4a15512f0a18e77670ea058b861 diff --git a/trunk/net/ipv4/netfilter/ipt_LOG.c b/trunk/net/ipv4/netfilter/ipt_LOG.c index 72ffc8fda2e9..d76d6c9ed946 100644 --- a/trunk/net/ipv4/netfilter/ipt_LOG.c +++ b/trunk/net/ipv4/netfilter/ipt_LOG.c @@ -442,8 +442,7 @@ ipt_log_packet(u_int8_t pf, } #endif - /* MAC logging for input path only. */ - if (in && !out) + if (in != NULL) dump_mac_header(m, loginfo, skb); dump_packet(m, loginfo, skb, 0); diff --git a/trunk/net/ipv6/netfilter/ip6t_LOG.c b/trunk/net/ipv6/netfilter/ip6t_LOG.c index 09c88891a753..05027b753721 100644 --- a/trunk/net/ipv6/netfilter/ip6t_LOG.c +++ b/trunk/net/ipv6/netfilter/ip6t_LOG.c @@ -452,8 +452,7 @@ ip6t_log_packet(u_int8_t pf, in ? in->name : "", out ? out->name : ""); - /* MAC logging for input path only. */ - if (in && !out) + if (in != NULL) dump_mac_header(m, loginfo, skb); dump_packet(m, loginfo, skb, skb_network_offset(skb), 1);