diff options
| author | Florian Westphal <fw@strlen.de> | 2015-04-28 07:33:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-29 14:56:40 -0400 |
| commit | 2b70fe5aba0dd00d81173243c7ab04c66aeb67d8 (patch) | |
| tree | e2713bb3f1b567c84cd76470850ee0adc585d9ea /net/sched | |
| parent | 165996bd351f0e711feff92479c0796098afaa38 (diff) | |
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/sched')
| -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, | |||
| 63 | skb->mark = c->mark; | 63 | skb->mark = c->mark; |
| 64 | /* using overlimits stats to count how many packets marked */ | 64 | /* using overlimits stats to count how many packets marked */ |
| 65 | ca->tcf_qstats.overlimits++; | 65 | ca->tcf_qstats.overlimits++; |
| 66 | nf_ct_put(c); | ||
| 67 | goto out; | 66 | goto out; |
| 68 | } | 67 | } |
| 69 | 68 | ||
| @@ -82,7 +81,6 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, | |||
| 82 | nf_ct_put(c); | 81 | nf_ct_put(c); |
| 83 | 82 | ||
| 84 | out: | 83 | out: |
| 85 | skb->nfct = NULL; | ||
| 86 | spin_unlock(&ca->tcf_lock); | 84 | spin_unlock(&ca->tcf_lock); |
| 87 | return ca->tcf_action; | 85 | return ca->tcf_action; |
| 88 | } | 86 | } |