From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Mon, 12 Mar 2012 08:53:13 +0000 (+0000)
Subject: bnx2x: ethtool returns req. AN even when AN fails
X-Git-Tag: v2.6.39-400.9.0~338^2~104
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9878924ecce6b22460a7015aea7d2e2a4691d7f;p=users%2Fjedix%2Flinux-maple.git

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.

(cherry picked from commit 241fb5d2b4205a523a50a85f9c312e1eda8ec53d)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 3110ce053562..777c19ca5afa 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1461,7 +1461,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;