* [PATCH] net: sched: act_connmark: don't zap skb->nfct
@ 2015-04-28 11:33 Florian Westphal
2015-04-28 12:03 ` Pablo Neira Ayuso
2015-04-29 18:57 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Florian Westphal @ 2015-04-28 11:33 UTC (permalink / raw)
To: netdev; +Cc: Florian Westphal, Jamal Hadi Salim
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>
---
shouldn't matter much in practice since this would be used in the
ingress path where skb->nfct is NULL in non-lo case.
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 8e47251..295d14b 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;
}
--
2.0.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: sched: act_connmark: don't zap skb->nfct
2015-04-28 11:33 [PATCH] net: sched: act_connmark: don't zap skb->nfct Florian Westphal
@ 2015-04-28 12:03 ` Pablo Neira Ayuso
2015-04-29 18:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2015-04-28 12:03 UTC (permalink / raw)
To: Florian Westphal; +Cc: netdev, Jamal Hadi Salim
On Tue, Apr 28, 2015 at 01:33:21PM +0200, Florian Westphal wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: sched: act_connmark: don't zap skb->nfct
2015-04-28 11:33 [PATCH] net: sched: act_connmark: don't zap skb->nfct Florian Westphal
2015-04-28 12:03 ` Pablo Neira Ayuso
@ 2015-04-29 18:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-04-29 18:57 UTC (permalink / raw)
To: fw; +Cc: netdev, jhs
From: Florian Westphal <fw@strlen.de>
Date: Tue, 28 Apr 2015 13:33:21 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-29 18:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-28 11:33 [PATCH] net: sched: act_connmark: don't zap skb->nfct Florian Westphal
2015-04-28 12:03 ` Pablo Neira Ayuso
2015-04-29 18:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).