34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Johannes Berg <johannes@sipsolutions.net>
|
|
Date: Sat, 29 Jun 2013 19:23:13 +0200
|
|
Subject: [1/6] alx: treat flow control correctly in alx_set_pauseparam()
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git//commit?id=ef0cc4b1d296ce041e3b24d103177dd70642740c
|
|
|
|
Even when alx_setup_speed_duplex() is called, we still
|
|
need to call alx_cfg_mac_flowcontrol() and set hw->flowctrl
|
|
if flow control changed.
|
|
|
|
This was a bug I accidentally introduced while simplifying
|
|
the original driver.
|
|
|
|
Reported-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/atheros/alx/ethtool.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/atheros/alx/ethtool.c b/drivers/net/ethernet/atheros/alx/ethtool.c
|
|
index 6fa2aec..50a91d0 100644
|
|
--- a/drivers/net/ethernet/atheros/alx/ethtool.c
|
|
+++ b/drivers/net/ethernet/atheros/alx/ethtool.c
|
|
@@ -187,7 +187,8 @@ static int alx_set_pauseparam(struct net_device *netdev,
|
|
|
|
if (reconfig_phy) {
|
|
err = alx_setup_speed_duplex(hw, hw->adv_cfg, fc);
|
|
- return err;
|
|
+ if (err)
|
|
+ return err;
|
|
}
|
|
|
|
/* flow control on mac */
|