projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
165996b
)
net: sched: act_connmark: don't zap skb->nfct
author
Florian Westphal
<
[email protected]
>
Tue, 28 Apr 2015 11:33:21 +0000
(13:33 +0200)
committer
David S. Miller
<
[email protected]
>
Wed, 29 Apr 2015 18:56:40 +0000
(14:56 -0400)
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 <
[email protected]
>
Signed-off-by: Florian Westphal <
[email protected]
>
Acked-by: Pablo Neira Ayuso <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/sched/act_connmark.c
patch
|
blob
|
history
diff --git
a/net/sched/act_connmark.c
b/net/sched/act_connmark.c
index 8e472518f9f6856dcd5802c16373b6579f7284eb..295d14bd6c678c31b56219371df83d4ebe3b0a2c 100644
(file)
--- 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;
}