Browse Source

bnx2x: Fix port identification problem

This patch fixes port identification on optic devices when there's no link on the port.

Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Yaniv Rosner 14 years ago
parent
commit
70dda99c41
1 changed files with 4 additions and 5 deletions
  1. 4 5
      drivers/net/bnx2x/bnx2x_ethtool.c

+ 4 - 5
drivers/net/bnx2x/bnx2x_ethtool.c

@@ -2114,19 +2114,18 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
 	for (i = 0; i < (data * 2); i++) {
 	for (i = 0; i < (data * 2); i++) {
 		if ((i % 2) == 0)
 		if ((i % 2) == 0)
 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
-				      LED_MODE_OPER, SPEED_1000);
+				      LED_MODE_ON, SPEED_1000);
 		else
 		else
 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
-				      LED_MODE_OFF, 0);
+				      LED_MODE_FRONT_PANEL_OFF, 0);
 
 
 		msleep_interruptible(500);
 		msleep_interruptible(500);
 		if (signal_pending(current))
 		if (signal_pending(current))
 			break;
 			break;
 	}
 	}
 
 
-	if (bp->link_vars.link_up)
-		bnx2x_set_led(&bp->link_params, &bp->link_vars, LED_MODE_OPER,
-			      bp->link_vars.line_speed);
+	bnx2x_set_led(&bp->link_params, &bp->link_vars,
+		      LED_MODE_OPER, bp->link_vars.line_speed);
 
 
 	return 0;
 	return 0;
 }
 }