|
@@ -3168,8 +3168,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
|
|
|
err |= tg3_readphy(tp, MII_BMCR, &bmcr);
|
|
|
|
|
|
if ((tp->link_config.autoneg == AUTONEG_ENABLE) && !force_reset &&
|
|
|
- (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT) &&
|
|
|
- tp->link_config.flowctrl == tp->link_config.active_flowctrl) {
|
|
|
+ (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT)) {
|
|
|
/* do nothing, just check for link up at the end */
|
|
|
} else if (tp->link_config.autoneg == AUTONEG_ENABLE) {
|
|
|
u32 adv, new_adv;
|