diff options
| author | Florian Westphal <fw@strlen.de> | 2015-04-28 13:33:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-29 20:56:40 +0200 |
| commit | 2b70fe5aba0dd00d81173243c7ab04c66aeb67d8 (patch) | |
| tree | e2713bb3f1b567c84cd76470850ee0adc585d9ea /net | |
| parent | trivial: net: systemport: bcmsysport.h: fix 0x0x prefix (diff) | |
| download | linux-2b70fe5aba0dd00d81173243c7ab04c66aeb67d8.tar.xz linux-2b70fe5aba0dd00d81173243c7ab04c66aeb67d8.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_connmark.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index 8e472518f9f6..295d14bd6c67 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -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; } |