diff --git a/[refs] b/[refs] index 7e0819fffca2..7ac7011e8a75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2691d51d7243560aa0870dadbf5c6b98f647f751 +refs/heads/master: 0c593270432035b7b9ba27ee7dd4f32f6feea2e0 diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index 8abce3c182e0..a695e7f0647c 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -2149,9 +2149,7 @@ static u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode) /* Initialize link parameters structure variables */ /* It is recommended to turn off RX FC for jumbo frames for better performance */ - if (IS_E1HMF(bp)) - bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_BOTH; - else if (bp->dev->mtu > 5000) + if (bp->dev->mtu > 5000) bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_TX; else bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_BOTH;