From d462ea9dfa013bd57dbd0c39a451e7cd6e0f1d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kube=C4=8Dek?= Date: Tue, 28 May 2013 22:37:03 +0000 Subject: [PATCH] --- yaml --- r: 376635 b: refs/heads/master c: d660164d79b67f879db35a7d61e47d3b99bc714e h: refs/heads/master i: 376633: db4746a6806174083314bdd03921670c58c0032b 376631: 08f3d5cc1ce6e853cf5b03a34af7a7314a9cdaba v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_LOG.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0418030aff1d..7a81122d978f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc7b3eb900aab02e5cafbca3948d005be13fb4a5 +refs/heads/master: d660164d79b67f879db35a7d61e47d3b99bc714e diff --git a/trunk/net/netfilter/xt_LOG.c b/trunk/net/netfilter/xt_LOG.c index 491c7d821a0b..5ab24843370a 100644 --- a/trunk/net/netfilter/xt_LOG.c +++ b/trunk/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); }