Netdev List
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com,
	daniel@iogearbox.net, mlxsw@mellanox.com, andrew@lunn.ch,
	vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com,
	simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com,
	dirk.vandermerwe@netronome.com, alexander.h.duyck@intel.com,
	amritha.nambiar@intel.com, oss-drivers@netronome.com,
	yisen.zhuang@huawei.com, salil.mehta@huawei.com
Subject: [patch net-next v2 09/16] mlxsw: spectrum: rename cls arg in matchall processing
Date: Mon,  7 Aug 2017 10:15:25 +0200	[thread overview]
Message-ID: <20170807081532.32760-10-jiri@resnulli.us> (raw)
In-Reply-To: <20170807081532.32760-1-jiri@resnulli.us>

From: Jiri Pirko <jiri@mellanox.com>

To sync-up with the naming in the rest of the driver, rename the cls arg.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 9f8ba37..f333d08 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1618,7 +1618,7 @@ mlxsw_sp_port_del_cls_matchall_sample(struct mlxsw_sp_port *mlxsw_sp_port)
 
 static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 					  __be16 protocol,
-					  struct tc_cls_matchall_offload *cls,
+					  struct tc_cls_matchall_offload *f,
 					  bool ingress)
 {
 	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;
@@ -1626,7 +1626,7 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 	LIST_HEAD(actions);
 	int err;
 
-	if (!tcf_exts_has_one_action(cls->exts)) {
+	if (!tcf_exts_has_one_action(f->exts)) {
 		netdev_err(mlxsw_sp_port->dev, "only singular actions are supported\n");
 		return -EOPNOTSUPP;
 	}
@@ -1634,9 +1634,9 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 	mall_tc_entry = kzalloc(sizeof(*mall_tc_entry), GFP_KERNEL);
 	if (!mall_tc_entry)
 		return -ENOMEM;
-	mall_tc_entry->cookie = cls->cookie;
+	mall_tc_entry->cookie = f->cookie;
 
-	tcf_exts_to_list(cls->exts, &actions);
+	tcf_exts_to_list(f->exts, &actions);
 	a = list_first_entry(&actions, struct tc_action, list);
 
 	if (is_tcf_mirred_egress_mirror(a) && protocol == htons(ETH_P_ALL)) {
@@ -1648,7 +1648,7 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 							    mirror, a, ingress);
 	} else if (is_tcf_sample(a) && protocol == htons(ETH_P_ALL)) {
 		mall_tc_entry->type = MLXSW_SP_PORT_MALL_SAMPLE;
-		err = mlxsw_sp_port_add_cls_matchall_sample(mlxsw_sp_port, cls,
+		err = mlxsw_sp_port_add_cls_matchall_sample(mlxsw_sp_port, f,
 							    a, ingress);
 	} else {
 		err = -EOPNOTSUPP;
@@ -1666,12 +1666,12 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 }
 
 static void mlxsw_sp_port_del_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
-					   struct tc_cls_matchall_offload *cls)
+					   struct tc_cls_matchall_offload *f)
 {
 	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;
 
 	mall_tc_entry = mlxsw_sp_port_mall_tc_entry_find(mlxsw_sp_port,
-							 cls->cookie);
+							 f->cookie);
 	if (!mall_tc_entry) {
 		netdev_dbg(mlxsw_sp_port->dev, "tc entry not found on port\n");
 		return;
-- 
2.9.3

  parent reply	other threads:[~2017-08-07  8:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07  8:15 [patch net-next v2 00/16] net: sched: summer cleanup part 2, ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 01/16] net: sched: make type an argument for ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 02/16] net: sched: rename TC_SETUP_MATCHALL to TC_SETUP_CLSMATCHALL Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 03/16] net: sched: make egress_dev flag part of flower offload struct Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 04/16] cxgb4: push cls_u32 setup_tc processing into a separate function Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 05/16] ixgbe: push cls_u32 and mqprio setup_tc processing into separate functions Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 06/16] mlx5e: push cls_flower " Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 07/16] mlx5e_rep: push cls_flower setup_tc processing into a separate function Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 08/16] mlxsw: spectrum: push cls_flower and cls_matchall setup_tc processing into separate functions Jiri Pirko
2017-08-07  8:15 ` Jiri Pirko [this message]
2017-08-07  8:15 ` [patch net-next v2 10/16] dsa: push cls_matchall setup_tc processing into a separate function Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 11/16] nfp: change flows in apps that offload ndo_setup_tc Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 12/16] hns3pf: don't check handle during mqprio offload Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 13/16] net: sched: push cls related args into cls_common structure Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 14/16] net: sched: move prio into cls_common Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 15/16] net: sched: change return value of ndo_setup_tc for driver supporting mqprio only Jiri Pirko
2017-08-07  8:15 ` [patch net-next v2 16/16] net: sched: get rid of struct tc_to_netdev Jiri Pirko
2017-08-07 16:43 ` [patch net-next v2 00/16] net: sched: summer cleanup part 2, ndo_setup_tc David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170807081532.32760-10-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=alexander.h.duyck@intel.com \
    --cc=amritha.nambiar@intel.com \
    --cc=andrew@lunn.ch \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=dirk.vandermerwe@netronome.com \
    --cc=f.fainelli@gmail.com \
    --cc=jhs@mojatatu.com \
    --cc=mlxsw@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@netronome.com \
    --cc=pieter.jansenvanvuuren@netronome.com \
    --cc=salil.mehta@huawei.com \
    --cc=simon.horman@netronome.com \
    --cc=vivien.didelot@savoirfairelinux.com \
    --cc=xiyou.wangcong@gmail.com \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox