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>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 8f8421d4dfff20aea586fd860a9f10aa74e0c8da..858d1b5433de4b3833d39bb6978d63ab1be2b35f 100644 (file)
--- 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;