diff mbox series

[net] smsc75xx: fix smsc75xx_set_features()

Message ID 1519191746.55655.34.camel@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] smsc75xx: fix smsc75xx_set_features() | expand

Commit Message

Eric Dumazet Feb. 21, 2018, 5:42 a.m. UTC 
From: Eric Dumazet <edumazet@google.com>

If an attempt is made to disable RX checksums, USB adapter is changed
but netdev->features is not, because smsc75xx_set_features() returns a
non zero value.

This throws errors from netdev_rx_csum_fault() :
<devname>: hw csum failure

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
---
 drivers/net/usb/smsc75xx.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

David Miller Feb. 22, 2018, 7:05 p.m. UTC | #1 
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 20 Feb 2018 21:42:26 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> If an attempt is made to disable RX checksums, USB adapter is changed
> but netdev->features is not, because smsc75xx_set_features() returns a
> non zero value.
> 
> This throws errors from netdev_rx_csum_fault() :
> <devname>: hw csum failure
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Steve Glendinning <steve.glendinning@shawell.net>

Applied, thanks Eric.
diff mbox series

Patch

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index d0a113743195acae86931c51eea50b94ddadd487..7a6a1fe793090b8e28f5ef075f5ebc2ad385b5eb 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -954,10 +954,11 @@  static int smsc75xx_set_features(struct net_device *netdev,
 	/* it's racing here! */
 
 	ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-	if (ret < 0)
+	if (ret < 0) {
 		netdev_warn(dev->net, "Error writing RFE_CTL\n");
-
-	return ret;
+		return ret;
+	}
+	return 0;
 }
 
 static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)