diff --git a/[refs] b/[refs] index 4add6f20c56b..1bd395c6d6ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 382984618e847ad4621d7ccbd48f5ec702c6a78e +refs/heads/master: 241fb5d2b4205a523a50a85f9c312e1eda8ec53d diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 8f8421d4dfff..858d1b5433de 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/trunk/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;