From patchwork Thu Dec 13 06:49:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Quantal, 11/29] be2net: Fix error while toggling autoneg of pause parameters From: Jesse Sung X-Patchwork-Id: 205753 Message-Id: <1355381402-10497-11-git-send-email-jesse.sung@canonical.com> To: kernel-team@lists.ubuntu.com Cc: Padmanabh Ratnakar , Sarveshwar Bandi Date: Thu, 13 Dec 2012 14:49:44 +0800 From: Padmanabh Ratnakar BugLink: https://launchpad.net/bugs/1083088 Autonegotiation of pause parameters is possible only on some PHYs. Ability of autoneg of pause parameters is reported by adapter. Autoneg of pause parameters cannot be changed from driver. Fix driver to give error when autoneg mode is toggled by user. Signed-off-by: Padmanabh Ratnakar Signed-off-by: David S. Miller (cherry picked from commit c871c5f29315aaf27acf6ceed7a69f9069049639) Signed-off-by: Wen-chien Jesse Sung --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index 59ee51a..c0e7006 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -648,7 +648,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) struct be_adapter *adapter = netdev_priv(netdev); int status; - if (ecmd->autoneg != 0) + if (ecmd->autoneg != adapter->phy.fc_autoneg) return -EINVAL; adapter->tx_fc = ecmd->tx_pause; adapter->rx_fc = ecmd->rx_pause;