raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

lan78xx: Return tx_lpi_timer even if disabled

Browse Source 
Disabling tx_lpi or eee should not cause the value of tx_lpi_timer to
be lost, even though it is not useful until they are re-enabled.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2024-06-12 16:11:19 +01:00
committed by Dom Cobley
parent 9fcadf1424
commit ebffaa4935
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/usb/lan78xx.c
View File

@@ -1818,15 +1818,34 @@ exit_pm_put:
static int lan78xx_get_eee(struct net_device *net, struct ethtool_keee *edata) static int lan78xx_get_eee(struct net_device *net, struct ethtool_keee *edata)
{ {
struct lan78xx_net *dev = netdev_priv(net); struct lan78xx_net *dev = netdev_priv(net);
u32 buf;
int ret;
return phylink_ethtool_get_eee(dev->phylink, edata); ret = phylink_ethtool_get_eee(dev->phylink, edata);
if (ret < 0)
return ret;
ret = lan78xx_read_reg(dev, EEE_TX_LPI_REQ_DLY, &buf);
if (ret >= 0)
edata->tx_lpi_timer = buf;
else
edata->tx_lpi_timer = 0;
return 0;
} }
static int lan78xx_set_eee(struct net_device *net, struct ethtool_keee *edata) static int lan78xx_set_eee(struct net_device *net, struct ethtool_keee *edata)
{ {
struct lan78xx_net *dev = netdev_priv(net); struct lan78xx_net *dev = netdev_priv(net);
u32 buf;
int ret;
return phylink_ethtool_set_eee(dev->phylink, edata); ret = phylink_ethtool_set_eee(dev->phylink, edata);
if (ret < 0)
return ret;
buf = (u32)edata->tx_lpi_timer;
return lan78xx_write_reg(dev, EEE_TX_LPI_REQ_DLY, buf);
} }
static void lan78xx_get_drvinfo(struct net_device *net, static void lan78xx_get_drvinfo(struct net_device *net,