diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 11:21:33 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 11:21:33 +0400 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /drivers/net/bnx2x/bnx2x_ethtool.c | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
| download | linux-e1943424e43974f85b82bb31eaf832823bf49ce7.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_ethtool.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_ethtool.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c index e711a2292446..4f42c314986c 100644 --- a/drivers/net/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/bnx2x/bnx2x_ethtool.c @@ -2030,20 +2030,19 @@ static int bnx2x_set_phys_id(struct net_device *dev, case ETHTOOL_ID_ON: bnx2x_set_led(&bp->link_params, &bp->link_vars, - LED_MODE_OPER, SPEED_1000); + LED_MODE_ON, SPEED_1000); break; case ETHTOOL_ID_OFF: bnx2x_set_led(&bp->link_params, &bp->link_vars, - LED_MODE_OFF, 0); + LED_MODE_FRONT_PANEL_OFF, 0); break; case ETHTOOL_ID_INACTIVE: - 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; |