summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Mintz <yuvalmin@broadcom.com>2012-03-12 08:53:13 +0000
committerDavid S. Miller <davem@davemloft.net>2012-03-12 17:10:49 -0700
commit241fb5d2b4205a523a50a85f9c312e1eda8ec53d (patch)
tree8848234f6a44732bab5eaa1f80b0108123fdf3c0
parent382984618e847ad4621d7ccbd48f5ec702c6a78e (diff)
downloadlinux-3.10-241fb5d2b4205a523a50a85f9c312e1eda8ec53d.tar.gz
linux-3.10-241fb5d2b4205a523a50a85f9c312e1eda8ec53d.tar.bz2
linux-3.10-241fb5d2b4205a523a50a85f9c312e1eda8ec53d.zip
bnx2x: ethtool returns req. AN even when AN fails
Previously, if autoneg failed, ethtool would return the achieved autoneg. This patch corrects this, causing ethtool to return the requested autoneg capabilities even if autoneg fails. Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 8f8421d4dff..858d1b5433d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1450,7 +1450,7 @@ static void bnx2x_get_pauseparam(struct net_device *dev,
BNX2X_FLOW_CTRL_AUTO);
if (!epause->autoneg)
- cfg_reg = bp->link_vars.flow_ctrl;
+ cfg_reg = bp->link_params.req_flow_ctrl[cfg_idx];
else
cfg_reg = bp->link_params.req_fc_auto_adv;