diff options
-rw-r--r-- | net/sched/act_connmark.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index 2f9bc833d046..54c0bf54f2ac 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c | |||
@@ -31,8 +31,8 @@ | |||
31 | static unsigned int connmark_net_id; | 31 | static unsigned int connmark_net_id; |
32 | static struct tc_action_ops act_connmark_ops; | 32 | static struct tc_action_ops act_connmark_ops; |
33 | 33 | ||
34 | static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, | 34 | static int tcf_connmark_act(struct sk_buff *skb, const struct tc_action *a, |
35 | struct tcf_result *res) | 35 | struct tcf_result *res) |
36 | { | 36 | { |
37 | const struct nf_conntrack_tuple_hash *thash; | 37 | const struct nf_conntrack_tuple_hash *thash; |
38 | struct nf_conntrack_tuple tuple; | 38 | struct nf_conntrack_tuple tuple; |
@@ -209,7 +209,7 @@ static struct tc_action_ops act_connmark_ops = { | |||
209 | .kind = "connmark", | 209 | .kind = "connmark", |
210 | .type = TCA_ACT_CONNMARK, | 210 | .type = TCA_ACT_CONNMARK, |
211 | .owner = THIS_MODULE, | 211 | .owner = THIS_MODULE, |
212 | .act = tcf_connmark, | 212 | .act = tcf_connmark_act, |
213 | .dump = tcf_connmark_dump, | 213 | .dump = tcf_connmark_dump, |
214 | .init = tcf_connmark_init, | 214 | .init = tcf_connmark_init, |
215 | .walk = tcf_connmark_walker, | 215 | .walk = tcf_connmark_walker, |