diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 05:34:53 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 05:34:53 (GMT) |
commit | 38a4671cad3f0d277cf48445b49e42a475ebfb6a (patch) | |
tree | 7348f3dd5f4e1bec39758dcff748a9dcbbf3430c /net/netfilter/xt_LOG.c | |
parent | d652f7022b359afd5d34fc9fffd71df118521ead (diff) | |
parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
download | linux-fsl-qoriq-38a4671cad3f0d277cf48445b49e42a475ebfb6a.tar.xz |
Merge 3.10-rc5 into char-misc-next
Diffstat (limited to 'net/netfilter/xt_LOG.c')
-rw-r--r-- | net/netfilter/xt_LOG.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c index 491c7d8..5ab2484 100644 --- a/net/netfilter/xt_LOG.c +++ b/net/netfilter/xt_LOG.c @@ -737,7 +737,7 @@ static void dump_ipv6_packet(struct sbuff *m, dump_sk_uid_gid(m, skb->sk); /* Max length: 16 "MARK=0xFFFFFFFF " */ - if (!recurse && skb->mark) + if (recurse && skb->mark) sb_add(m, "MARK=0x%x ", skb->mark); } |