drivers: net: netdevsim: fix devlink_trap selftests failing

devlink_trap tests for the netdevsim fail due to misspelled
debugfs file name. Change this name, as well as name of callback
function, to match the naming as in the devlink itself - 'trap_drop_counter'.

Test-results:
selftests: drivers/net/netdevsim: devlink_trap.sh
TEST: Initialization                                                [ OK ]
TEST: Trap action                                                   [ OK ]
TEST: Trap metadata                                                 [ OK ]
TEST: Non-existing trap                                             [ OK ]
TEST: Non-existing trap action                                      [ OK ]
TEST: Trap statistics                                               [ OK ]
TEST: Trap group action                                             [ OK ]
TEST: Non-existing trap group                                       [ OK ]
TEST: Trap group statistics                                         [ OK ]
TEST: Trap policer                                                  [ OK ]
TEST: Trap policer binding                                          [ OK ]
TEST: Port delete                                                   [ OK ]
TEST: Device delete                                                 [ OK ]

Fixes: a7b3527a43fe ("drivers: net: netdevsim: add devlink trap_drop_counter_get implementation")
Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.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 d855219..6348307 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -269,9 +269,9 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
                err = PTR_ERR(nsim_dev->nodes_ddir);
                goto err_out;
        }
-       debugfs_create_bool("fail_trap_counter_get", 0600,
+       debugfs_create_bool("fail_trap_drop_counter_get", 0600,
                            nsim_dev->ddir,
-                           &nsim_dev->fail_trap_counter_get);
+                           &nsim_dev->fail_trap_drop_counter_get);
        nsim_udp_tunnels_debugfs_create(nsim_dev);
        return 0;
 
@@ -1208,14 +1208,14 @@ static int nsim_rate_node_parent_set(struct devlink_rate *child,
 }
 
 static int
-nsim_dev_devlink_trap_hw_counter_get(struct devlink *devlink,
-                                    const struct devlink_trap *trap,
-                                    u64 *p_drops)
+nsim_dev_devlink_trap_drop_counter_get(struct devlink *devlink,
+                                      const struct devlink_trap *trap,
+                                      u64 *p_drops)
 {
        struct nsim_dev *nsim_dev = devlink_priv(devlink);
        u64 *cnt;
 
-       if (nsim_dev->fail_trap_counter_get)
+       if (nsim_dev->fail_trap_drop_counter_get)
                return -EINVAL;
 
        cnt = &nsim_dev->trap_data->trap_pkt_cnt;
@@ -1247,7 +1247,7 @@ static const struct devlink_ops nsim_dev_devlink_ops = {
        .rate_node_del = nsim_rate_node_del,
        .rate_leaf_parent_set = nsim_rate_leaf_parent_set,
        .rate_node_parent_set = nsim_rate_node_parent_set,
-       .trap_drop_counter_get = nsim_dev_devlink_trap_hw_counter_get,
+       .trap_drop_counter_get = nsim_dev_devlink_trap_drop_counter_get,
 };
 
 #define NSIM_DEV_MAX_MACS_DEFAULT 32

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index f2304e6..ae46295 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -249,7 +249,7 @@ struct nsim_dev {
        bool fail_trap_group_set;
        bool fail_trap_policer_set;
        bool fail_trap_policer_counter_get;
-       bool fail_trap_counter_get;
+       bool fail_trap_drop_counter_get;
        struct {
                struct udp_tunnel_nic_shared utn_shared;
                u32 __ports[2][NSIM_UDP_TUNNEL_N_PORTS];