Commit 2b70fe5a authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller

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: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 165996bd
...@@ -63,7 +63,6 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, ...@@ -63,7 +63,6 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
skb->mark = c->mark; skb->mark = c->mark;
/* using overlimits stats to count how many packets marked */ /* using overlimits stats to count how many packets marked */
ca->tcf_qstats.overlimits++; ca->tcf_qstats.overlimits++;
nf_ct_put(c);
goto out; goto out;
} }
...@@ -82,7 +81,6 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, ...@@ -82,7 +81,6 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
nf_ct_put(c); nf_ct_put(c);
out: out:
skb->nfct = NULL;
spin_unlock(&ca->tcf_lock); spin_unlock(&ca->tcf_lock);
return ca->tcf_action; return ca->tcf_action;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment