diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /drivers/net/bnx2x/bnx2x_ethtool.c | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
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, | |||
| 2030 | 2030 | ||
| 2031 | case ETHTOOL_ID_ON: | 2031 | case ETHTOOL_ID_ON: |
| 2032 | bnx2x_set_led(&bp->link_params, &bp->link_vars, | 2032 | bnx2x_set_led(&bp->link_params, &bp->link_vars, |
| 2033 | LED_MODE_OPER, SPEED_1000); | 2033 | LED_MODE_ON, SPEED_1000); |
| 2034 | break; | 2034 | break; |
| 2035 | 2035 | ||
| 2036 | case ETHTOOL_ID_OFF: | 2036 | case ETHTOOL_ID_OFF: |
| 2037 | bnx2x_set_led(&bp->link_params, &bp->link_vars, | 2037 | bnx2x_set_led(&bp->link_params, &bp->link_vars, |
| 2038 | LED_MODE_OFF, 0); | 2038 | LED_MODE_FRONT_PANEL_OFF, 0); |
| 2039 | 2039 | ||
| 2040 | break; | 2040 | break; |
| 2041 | 2041 | ||
| 2042 | case ETHTOOL_ID_INACTIVE: | 2042 | case ETHTOOL_ID_INACTIVE: |
| 2043 | if (bp->link_vars.link_up) | 2043 | bnx2x_set_led(&bp->link_params, &bp->link_vars, |
| 2044 | bnx2x_set_led(&bp->link_params, &bp->link_vars, | 2044 | LED_MODE_OPER, |
| 2045 | LED_MODE_OPER, | 2045 | bp->link_vars.line_speed); |
| 2046 | bp->link_vars.line_speed); | ||
| 2047 | } | 2046 | } |
| 2048 | 2047 | ||
| 2049 | return 0; | 2048 | return 0; |