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 3110ce053562577effb3d7ef779894e513d0a0b9..777c19ca5afaab3bd96ccb75d024fe419cb9864e 100644 (file)
--- 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;