From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jamal Hadi Salim Subject: [PATCH net-next 01/13] net: sched: act_connmark method rename for grep-ability and consistency Date: Sun, 12 Aug 2018 09:34:49 -0400 Message-ID: <20180812133501.15278-2-jhs@emojatatu.com> References: <20180812133501.15278-1-jhs@emojatatu.com> Cc: xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, kernel@mojatatu.com, Jamal Hadi Salim To: davem@davemloft.net Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:34845 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbeHLQNh (ORCPT ); Sun, 12 Aug 2018 12:13:37 -0400 Received: by mail-io0-f196.google.com with SMTP id w11-v6so11933245iob.2 for ; Sun, 12 Aug 2018 06:35:33 -0700 (PDT) In-Reply-To: <20180812133501.15278-1-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Jamal Hadi Salim Signed-off-by: Jamal Hadi Salim --- net/sched/act_connmark.c | 6 +++--- 1 file 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 @@ static unsigned int connmark_net_id; static struct tc_action_ops act_connmark_ops; -static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, - struct tcf_result *res) +static int tcf_connmark_act(struct sk_buff *skb, const struct tc_action *a, + struct tcf_result *res) { const struct nf_conntrack_tuple_hash *thash; struct nf_conntrack_tuple tuple; @@ -209,7 +209,7 @@ static struct tc_action_ops act_connmark_ops = { .kind = "connmark", .type = TCA_ACT_CONNMARK, .owner = THIS_MODULE, - .act = tcf_connmark, + .act = tcf_connmark_act, .dump = tcf_connmark_dump, .init = tcf_connmark_init, .walk = tcf_connmark_walker, -- 2.11.0