github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 22:22:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: usb: lan78xx: Add error handling to set_rx_max_frame_length and set_mtu

Browse Source 
Improve error handling in `lan78xx_set_rx_max_frame_length` by:
- Checking return values from register read/write operations and
  propagating errors.
- Exiting immediately on failure to ensure proper error reporting.

In `lan78xx_change_mtu`, log errors when changing MTU fails, using `%pe`
for clear error representation.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20241204084142.1152696-9-o.rempel@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Oleksij Rempel 2024-12-04 09:41:40 +01:00 committed by Jakub Kicinski
parent 77586156b5
commit 65520a70cb
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2599,27 +2599,36 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size)
{
u32 buf;
bool rxenabled;
u32 buf;
int ret;
lan78xx_read_reg(dev, MAC_RX, &buf);
ret = lan78xx_read_reg(dev, MAC_RX, &buf);
if (ret < 0)
return ret;
rxenabled = ((buf & MAC_RX_RXEN_) != 0);
if (rxenabled) {
buf &= ~MAC_RX_RXEN_;
lan78xx_write_reg(dev, MAC_RX, buf);
ret = lan78xx_write_reg(dev, MAC_RX, buf);
if (ret < 0)
return ret;
}
/* add 4 to size for FCS */
buf &= ~MAC_RX_MAX_SIZE_MASK_;
buf |= (((size + 4) << MAC_RX_MAX_SIZE_SHIFT_) & MAC_RX_MAX_SIZE_MASK_);
lan78xx_write_reg(dev, MAC_RX, buf);
ret = lan78xx_write_reg(dev, MAC_RX, buf);
if (ret < 0)
return ret;
if (rxenabled) {
buf |= MAC_RX_RXEN_;
lan78xx_write_reg(dev, MAC_RX, buf);
ret = lan78xx_write_reg(dev, MAC_RX, buf);
if (ret < 0)
return ret;
}
return 0;
@ -2685,7 +2694,10 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu)
return ret;
ret = lan78xx_set_rx_max_frame_length(dev, max_frame_len);
if (!ret)
if (ret < 0)
netdev_err(dev->net, "MTU changed to %d from %d failed with %pe\n",
new_mtu, netdev->mtu, ERR_PTR(ret));
else
WRITE_ONCE(netdev->mtu, new_mtu);
usb_autopm_put_interface(dev->intf);