diff options
| author | Yaniv Rosner <yanivr@broadcom.com> | 2011-04-17 17:50:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-17 17:50:01 -0700 |
| commit | 70dda99c41fc8a153e09bdba9adb7805ba2a4bb3 (patch) | |
| tree | 52ae78da0e081098ff77a0e66546a09927942dbe /drivers/net/bnx2x | |
| parent | c8a75b345b38a9b63ffd077c0eb71707fa194fc6 (diff) | |
| download | kernel_samsung_smdk4412-70dda99c41fc8a153e09bdba9adb7805ba2a4bb3.zip kernel_samsung_smdk4412-70dda99c41fc8a153e09bdba9adb7805ba2a4bb3.tar.gz kernel_samsung_smdk4412-70dda99c41fc8a153e09bdba9adb7805ba2a4bb3.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/bnx2x')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_ethtool.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c index f505015..89cb977 100644 --- a/drivers/net/bnx2x/bnx2x_ethtool.c +++ b/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++) { if ((i % 2) == 0) bnx2x_set_led(&bp->link_params, &bp->link_vars, - LED_MODE_OPER, SPEED_1000); + LED_MODE_ON, SPEED_1000); else bnx2x_set_led(&bp->link_params, &bp->link_vars, - LED_MODE_OFF, 0); + LED_MODE_FRONT_PANEL_OFF, 0); msleep_interruptible(500); if (signal_pending(current)) 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; } |