Skip to content

Commit

Permalink
net: stmmac: clarify priv->pause and pause module parameter
Browse files Browse the repository at this point in the history
priv->pause corresponds with "pause_time" in the 802.3 specification,
and is also called "pause_time" in the various MAC backends. For
consistency, use the same name in the core stmmac code.

Clarify the units of the "pause" module parameter which sets up this
struct member to indicate that it's in units of the pause_quanta
defined by 802.3, which is 512 bit times.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Link: https://patch.msgid.link/E1tkKmD-004ObA-9K@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Russell King (Oracle) authored and Jakub Kicinski committed Feb 20, 2025
1 parent 47dfd7a commit ff1a9b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/stmicro/stmmac/stmmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ struct stmmac_priv {

int speed;
unsigned int flow_ctrl;
unsigned int pause;
unsigned int pause_time;
struct mii_bus *mii;

struct phylink_config phylink_config;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ MODULE_PARM_DESC(flow_ctrl, "Flow control ability [on/off]");

static int pause = PAUSE_TIME;
module_param(pause, int, 0644);
MODULE_PARM_DESC(pause, "Flow Control Pause Time");
MODULE_PARM_DESC(pause, "Flow Control Pause Time (units of 512 bit times)");

#define TC_DEFAULT 64
static int tc = TC_DEFAULT;
Expand Down Expand Up @@ -865,7 +865,7 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex)
u32 tx_cnt = priv->plat->tx_queues_to_use;

stmmac_flow_ctrl(priv, priv->hw, duplex, priv->flow_ctrl,
priv->pause, tx_cnt);
priv->pause_time, tx_cnt);
}

static unsigned long stmmac_mac_get_caps(struct phylink_config *config,
Expand Down Expand Up @@ -7404,7 +7404,7 @@ int stmmac_dvr_probe(struct device *device,
return -ENOMEM;

stmmac_set_ethtool_ops(ndev);
priv->pause = pause;
priv->pause_time = pause;
priv->plat = plat_dat;
priv->ioaddr = res->addr;
priv->dev->base_addr = (unsigned long)res->addr;
Expand Down

0 comments on commit ff1a9b2

Please sign in to comment.