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

Commit 93393b33 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Simplify traps definition 



Instead of copying & pasting the same struct initialization for every
Rx listener, just use a macro.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bc506b4

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

+31 −115
Original line number Original line Diff line number Diff line
@@ -2570,123 +2570,39 @@ static void mlxsw_sp_rx_listener_func(struct sk_buff *skb, u8 local_port, 
	netif_receive_skb(skb);

	netif_receive_skb(skb);

}

}





#define MLXSW_SP_RXL(_func, _trap_id)			\

	{						\

		.func = _func,				\

		.local_port = MLXSW_PORT_DONT_CARE,	\

		.trap_id = MLXSW_TRAP_ID_##_trap_id,	\

	}



static const struct mlxsw_rx_listener mlxsw_sp_rx_listener[] = {

static const struct mlxsw_rx_listener mlxsw_sp_rx_listener[] = {

	{

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, FDB_MC),

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_FDB_MC,

	},

	/* Traps for specific L2 packet types, not trapped as FDB MC */

	/* Traps for specific L2 packet types, not trapped as FDB MC */

	{

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, STP),

		.func = mlxsw_sp_rx_listener_func,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, LACP),

		.local_port = MLXSW_PORT_DONT_CARE,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, EAPOL),

		.trap_id = MLXSW_TRAP_ID_STP,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, LLDP),

	},

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, MMRP),

	{

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, MVRP),

		.func = mlxsw_sp_rx_listener_func,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, RPVST),

		.local_port = MLXSW_PORT_DONT_CARE,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, DHCP),

		.trap_id = MLXSW_TRAP_ID_LACP,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IGMP_QUERY),

	},

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IGMP_V1_REPORT),

	{

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IGMP_V2_REPORT),

		.func = mlxsw_sp_rx_listener_func,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IGMP_V2_LEAVE),

		.local_port = MLXSW_PORT_DONT_CARE,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IGMP_V3_REPORT),

		.trap_id = MLXSW_TRAP_ID_EAPOL,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, ARPBC),

	},

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, ARPUC),

	{

	/* L3 traps */

		.func = mlxsw_sp_rx_listener_func,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, MTUERROR),

		.local_port = MLXSW_PORT_DONT_CARE,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, TTLERROR),

		.trap_id = MLXSW_TRAP_ID_LLDP,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, LBERROR),

	},

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, OSPF),

	{

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, IP2ME),

		.func = mlxsw_sp_rx_listener_func,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, RTR_INGRESS0),

		.local_port = MLXSW_PORT_DONT_CARE,

	MLXSW_SP_RXL(mlxsw_sp_rx_listener_func, HOST_MISS_IPV4),

		.trap_id = MLXSW_TRAP_ID_MMRP,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_MVRP,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_RPVST,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_DHCP,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IGMP_QUERY,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IGMP_V1_REPORT,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IGMP_V2_REPORT,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IGMP_V2_LEAVE,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IGMP_V3_REPORT,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_ARPBC,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_ARPUC,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_MTUERROR,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_TTLERROR,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_LBERROR,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_OSPF,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_IP2ME,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_RTR_INGRESS0,

	},

	{

		.func = mlxsw_sp_rx_listener_func,

		.local_port = MLXSW_PORT_DONT_CARE,

		.trap_id = MLXSW_TRAP_ID_HOST_MISS_IPV4,

	},

};

};





static int mlxsw_sp_traps_init(struct mlxsw_sp *mlxsw_sp)

static int mlxsw_sp_traps_init(struct mlxsw_sp *mlxsw_sp)