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

mlxsw: spectrum: Rename ARP trap group 



The ARP trap group will be used for IPv6 ND traps in the next patch, so
rename it to "NEIGH_DISCOVERY" which is more appropriate.

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

drivers/net/ethernet/mellanox/mlxsw/reg.h

+1 −1
Original line number Diff line number Diff line
@@ -5536,7 +5536,7 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_PIM,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME,

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

+7 −6
Original line number Diff line number Diff line
@@ -4050,8 +4050,8 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	MLXSW_SP_RXL_NO_MARK(IGMP_V2_REPORT, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V2_LEAVE, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V3_REPORT, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_MARK(ARPBC, MIRROR_TO_CPU, ARP, false),

	MLXSW_SP_RXL_MARK(ARPUC, MIRROR_TO_CPU, ARP, false),

	MLXSW_SP_RXL_MARK(ARPBC, MIRROR_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_MARK(ARPUC, MIRROR_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_NO_MARK(FID_MISS, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV6_MLDV12_LISTENER_QUERY, MIRROR_TO_CPU,

			  MC_SNOOPING, false),
@@ -4112,8 +4112,9 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	MLXSW_SP_RXL_MARK(ACL1, TRAP_TO_CPU, MULTICAST, false),

	MLXSW_SP_RXL_L3_MARK(ACL2, TRAP_TO_CPU, MULTICAST, false),

	/* NVE traps */

	MLXSW_SP_RXL_MARK(NVE_ENCAP_ARP, TRAP_TO_CPU, ARP, false),

	MLXSW_SP_RXL_NO_MARK(NVE_DECAP_ARP, TRAP_TO_CPU, ARP, false),

	MLXSW_SP_RXL_MARK(NVE_ENCAP_ARP, TRAP_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_NO_MARK(NVE_DECAP_ARP, TRAP_TO_CPU, NEIGH_DISCOVERY,

			     false),

	/* PTP traps */

	MLXSW_RXL(mlxsw_sp_rx_listener_ptp, PTP0, TRAP_TO_CPU,

		  false, SP_PTP0, DISCARD),
@@ -4161,7 +4162,7 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core) 
			burst_size = 10;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:
@@ -4238,7 +4239,7 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core) 
			priority = 3;

			tc = 3;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP1:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP:

CRA Git | Maintained and supported by SUSTech CRA and CCSE