Skip to content

Commit

Permalink
netdevsim: move ethtool pause params in separate struct
Browse files Browse the repository at this point in the history
This will help the refactoring in the next commit
when coalesce and ring settings are added.

Signed-off-by: Antonio Cardace <acardace@redhat.com>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Antonio Cardace authored and Jakub Kicinski committed Nov 20, 2020
1 parent 4ae2199 commit 77f9591
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
16 changes: 8 additions & 8 deletions drivers/net/netdevsim/ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ nsim_get_pause_stats(struct net_device *dev,
{
struct netdevsim *ns = netdev_priv(dev);

if (ns->ethtool.report_stats_rx)
if (ns->ethtool.pauseparam.report_stats_rx)
pause_stats->rx_pause_frames = 1;
if (ns->ethtool.report_stats_tx)
if (ns->ethtool.pauseparam.report_stats_tx)
pause_stats->tx_pause_frames = 2;
}

Expand All @@ -25,8 +25,8 @@ nsim_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *pause)
struct netdevsim *ns = netdev_priv(dev);

pause->autoneg = 0; /* We don't support ksettings, so can't pretend */
pause->rx_pause = ns->ethtool.rx;
pause->tx_pause = ns->ethtool.tx;
pause->rx_pause = ns->ethtool.pauseparam.rx;
pause->tx_pause = ns->ethtool.pauseparam.tx;
}

static int
Expand All @@ -37,8 +37,8 @@ nsim_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *pause)
if (pause->autoneg)
return -EINVAL;

ns->ethtool.rx = pause->rx_pause;
ns->ethtool.tx = pause->tx_pause;
ns->ethtool.pauseparam.rx = pause->rx_pause;
ns->ethtool.pauseparam.tx = pause->tx_pause;
return 0;
}

Expand All @@ -58,7 +58,7 @@ void nsim_ethtool_init(struct netdevsim *ns)

dir = debugfs_create_dir("pause", ethtool);
debugfs_create_bool("report_stats_rx", 0600, dir,
&ns->ethtool.report_stats_rx);
&ns->ethtool.pauseparam.report_stats_rx);
debugfs_create_bool("report_stats_tx", 0600, dir,
&ns->ethtool.report_stats_tx);
&ns->ethtool.pauseparam.report_stats_tx);
}
6 changes: 5 additions & 1 deletion drivers/net/netdevsim/netdevsim.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,17 @@ struct nsim_ipsec {
u32 ok;
};

struct nsim_ethtool {
struct nsim_ethtool_pauseparam {
bool rx;
bool tx;
bool report_stats_rx;
bool report_stats_tx;
};

struct nsim_ethtool {
struct nsim_ethtool_pauseparam pauseparam;
};

struct netdevsim {
struct net_device *netdev;
struct nsim_dev *nsim_dev;
Expand Down

0 comments on commit 77f9591

Please sign in to comment.