Commit 2f61f38a authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: fix timestamping configuration after suspend/resume 



When stmmac_init_timestamping() is called, it clears the receive and
transmit path booleans that allow timestamps to be read. These are
never re-initialised until after userspace requests timestamping
features to be enabled.

However, our copy of the timestamp configuration is not cleared, which
means we return the old configuration to userspace when requested.
This is inconsistent. Fix this by clearing the timestamp configuration.

Fixes: d6228b7c ("net: stmmac: implement the SIOCGHWTSTAMP ioctl")
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/E1vuUu4-0000000Afea-0j9B@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1348659d

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ static int stmmac_init_timestamping(struct stmmac_priv *priv) 
		netdev_info(priv->dev,

			    "IEEE 1588-2008 Advanced Timestamp supported\n");



	memset(&priv->tstamp_config, 0, sizeof(priv->tstamp_config));

	priv->hwts_tx_en = 0;

	priv->hwts_rx_en = 0;