Message ID | 1558414542-28550-1-git-send-email-weifeng.voon@intel.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net] net: stmmac: fix ethtool flow control not able to get/set | expand |
On Tue, May 21, 2019 at 12:55:42PM +0800, Weifeng Voon wrote: > From: "Tan, Tee Min" <tee.min.tan@intel.com> > > Currently ethtool was not able to get/set the flow control due to a > missing "!". It will always return -EOPNOTSUPP even the device is > flow control supported. > > This patch fixes the condition check for ethtool flow control get/set > function for ETHTOOL_LINK_MODE_Asym_Pause_BIT. > > Fixes: 3c1bcc8614db (“net: ethernet: Convert phydev advertize and supported from u32 to link mode”) > Signed-off-by: Tan, Tee Min <tee.min.tan@intel.com> > Reviewed-by: Ong Boon Leong <boon.leong.ong@intel.com> > Signed-off-by: Voon, Weifeng <weifeng.voon@intel.com@intel.com> Upps, my bad. Sorry. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Weifeng Voon <weifeng.voon@intel.com> Date: Tue, 21 May 2019 12:55:42 +0800 > From: "Tan, Tee Min" <tee.min.tan@intel.com> > > Currently ethtool was not able to get/set the flow control due to a > missing "!". It will always return -EOPNOTSUPP even the device is > flow control supported. > > This patch fixes the condition check for ethtool flow control get/set > function for ETHTOOL_LINK_MODE_Asym_Pause_BIT. > > Fixes: 3c1bcc8614db (“net: ethernet: Convert phydev advertize and supported from u32 to link mode”) > Signed-off-by: Tan, Tee Min <tee.min.tan@intel.com> > Reviewed-by: Ong Boon Leong <boon.leong.ong@intel.com> > Signed-off-by: Voon, Weifeng <weifeng.voon@intel.com@intel.com> Applied and queued up for -stable.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 3c749c3..e09522c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -460,7 +460,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev, } else { if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, netdev->phydev->supported) || - linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, netdev->phydev->supported)) return; } @@ -491,7 +491,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev, } else { if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, phy->supported) || - linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phy->supported)) return -EOPNOTSUPP; }