Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cbf14ed authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum: rename cls arg in matchall processing 



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

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd33f1df

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+7 −7
Original line number Diff line number Diff line
@@ -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;