netdevsim: Move layer 3 exceptions to exceptions trap group

The layer 3 exceptions are still subject to the same trap policer, so
nothing changes, but user space can choose to assign a different one.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index dc3ff0e20944db01a246d78ee15bb5b7717437c5..09d947eff980d56419b413c0d5eebbe2638f6db1 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -458,6 +458,7 @@ static const struct devlink_trap_policer nsim_trap_policers_arr[] = {
 static const struct devlink_trap_group nsim_trap_groups_arr[] = {
        DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS, 0),
        DEVLINK_TRAP_GROUP_GENERIC(L3_DROPS, 1),
+       DEVLINK_TRAP_GROUP_GENERIC(L3_EXCEPTIONS, 1),
        DEVLINK_TRAP_GROUP_GENERIC(BUFFER_DROPS, 2),
        DEVLINK_TRAP_GROUP_GENERIC(ACL_DROPS, 3),
 };
@@ -471,7 +472,7 @@ static const struct devlink_trap nsim_traps_arr[] = {
        NSIM_TRAP_DROP(PORT_LOOPBACK_FILTER, L2_DROPS),
        NSIM_TRAP_DRIVER_EXCEPTION(FID_MISS, L2_DROPS),
        NSIM_TRAP_DROP(BLACKHOLE_ROUTE, L3_DROPS),
-       NSIM_TRAP_EXCEPTION(TTL_ERROR, L3_DROPS),
+       NSIM_TRAP_EXCEPTION(TTL_ERROR, L3_EXCEPTIONS),
        NSIM_TRAP_DROP(TAIL_DROP, BUFFER_DROPS),
        NSIM_TRAP_DROP_EXT(INGRESS_FLOW_ACTION_DROP, ACL_DROPS,
                           DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE),