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

Commit 86cb13e4 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Fix compilation error when CLS_ACT isn't set 



When CONFIG_NET_CLS_ACT isn't set 'struct tcf_exts' has no member named
'actions' and we therefore must not access it. Otherwise compilation
fails.

Fix this by introducing a new macro similar to tc_no_actions(), which
always returns 'false' if CONFIG_NET_CLS_ACT isn't set.

Fixes: 763b4b70 ("mlxsw: spectrum: Add support in matchall mirror TC offloading")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3568bdf0

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

+5 −6
Original line number Diff line number Diff line
@@ -1148,23 +1148,22 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port, 
					  struct tc_cls_matchall_offload *cls,

					  bool ingress)

{

	struct tcf_exts *exts = cls->exts;

	const struct tc_action *a;

	int err;



	if (!list_is_singular(&exts->actions)) {

	if (!tc_single_action(cls->exts)) {

		netdev_err(mlxsw_sp_port->dev, "only singular actions are supported\n");

		return -ENOTSUPP;

	}



	a = list_first_entry(&exts->actions, struct tc_action, list);

	if (is_tcf_mirred_mirror(a) && protocol == htons(ETH_P_ALL)) {

	tc_for_each_action(a, cls->exts) {

		if (!is_tcf_mirred_mirror(a) || protocol != htons(ETH_P_ALL))

			return -ENOTSUPP;



		err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port, cls,

							    a, ingress);

		if (err)

			return err;

	} else {

		return -ENOTSUPP;

	}



	return 0;

include/net/act_api.h

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int); 
#define tc_for_each_action(_a, _exts) \

	list_for_each_entry(a, &(_exts)->actions, list)



#define tc_single_action(_exts) \

	(list_is_singular(&(_exts)->actions))



static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,

					   u64 packets, u64 lastuse)

{
@@ -205,6 +208,7 @@ static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes, 


#define tc_no_actions(_exts) true

#define tc_for_each_action(_a, _exts) while ((void)(_a), 0)

#define tc_single_action(_exts) false

#define tcf_action_stats_update(a, bytes, packets, lastuse)



#endif /* CONFIG_NET_CLS_ACT */