Commit 2b70fe5a authored Apr 28, 2015 by Florian Westphal Committed by David S. Miller Apr 29, 2015

net: sched: act_connmark: don't zap skb->nfct



This action is meant to be passive, i.e. we should not alter
skb->nfct: If nfct is present just leave it alone.

Compile tested only.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 165996bd

net/sched/act_connmark.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ static int tcf_connmark(struct sk_buff skb, const struct tc_action a,
		skb->mark = c->mark;
		/* using overlimits stats to count how many packets marked */
		ca->tcf_qstats.overlimits++;
		nf_ct_put(c);
		goto out;
		}

		@@ -82,7 +81,6 @@ static int tcf_connmark(struct sk_buff skb, const struct tc_action a,
		nf_ct_put(c);

		out:
		skb->nfct = NULL;
		spin_unlock(&ca->tcf_lock);
		return ca->tcf_action;
		}