hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netdevsim: fix duplicated debugfs directory 

The "ethtool" debugfs directory holds per-netdev knobs, so move
it from the device instance directory to the port directory.

This fixes the following warning when creating multiple ports:

 debugfs: Directory 'ethtool' with parent 'netdevsim1' already present!

Fixes: ff1f7c17fb ("netdevsim: add pause frame stats")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2020-09-25 18:19:13 -07:00 committed by David S. Miller
parent dfa6692104
commit 090bc03bc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netdevsim/ethtool.c
View File

@ -54,7 +54,7 @@ void nsim_ethtool_init(struct netdevsim *ns)
ns->netdev->ethtool_ops = &nsim_ethtool_ops; ns->netdev->ethtool_ops = &nsim_ethtool_ops;
ethtool = debugfs_create_dir("ethtool", ns->nsim_dev->ddir); ethtool = debugfs_create_dir("ethtool", ns->nsim_dev_port->ddir);
dir = debugfs_create_dir("pause", ethtool); dir = debugfs_create_dir("pause", ethtool);
debugfs_create_bool("report_stats_rx", 0600, dir, debugfs_create_bool("report_stats_rx", 0600, dir,

2
tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh
View File

@ -3,7 +3,7 @@
NSIM_ID=$((RANDOM % 1024)) NSIM_ID=$((RANDOM % 1024))
NSIM_DEV_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_ID NSIM_DEV_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_ID
NSIM_DEV_DFS=/sys/kernel/debug/netdevsim/netdevsim$NSIM_ID NSIM_DEV_DFS=/sys/kernel/debug/netdevsim/netdevsim$NSIM_ID/ports/0
NSIM_NETDEV= NSIM_NETDEV=
num_passes=0 num_passes=0
num_errors=0 num_errors=0