diff options
author | Eilon Greenstein <eilong@broadcom.com> | 2013-09-06 05:55:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-06 14:43:49 -0400 |
commit | 937e5c3d63a17c0543912522ec4061a995558a70 (patch) | |
tree | 75639e1c588f8cd80c9831f5ec81a372450d285e /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |
parent | 9b0be651ccb2fbe0e8fb08427d90237719b1022e (diff) |
bnx2x: Restore a call to config_init
Commit c0a77ec74f295013d7ba3204dd3ed25fccf83cb4 'bnx2x: Add missing braces in
bnx2x:bnx2x_link_initialize' identified indentation problem, but resolved it
by adding braces instead of fixing the indentation. The braces now prevents a
config_init call in some cases, though it should be called regardless of that
condition. This patch removes the braces and fix the confusing indentation
that caused this mess.
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
CC: Dave Jones <davej@redhat.com>
Tested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 664568420c9b..d60a2ea3da19 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
@@ -6501,13 +6501,10 @@ static int bnx2x_link_initialize(struct link_params *params, | |||
6501 | struct bnx2x_phy *phy = ¶ms->phy[INT_PHY]; | 6501 | struct bnx2x_phy *phy = ¶ms->phy[INT_PHY]; |
6502 | if (vars->line_speed == SPEED_AUTO_NEG && | 6502 | if (vars->line_speed == SPEED_AUTO_NEG && |
6503 | (CHIP_IS_E1x(bp) || | 6503 | (CHIP_IS_E1x(bp) || |
6504 | CHIP_IS_E2(bp))) { | 6504 | CHIP_IS_E2(bp))) |
6505 | bnx2x_set_parallel_detection(phy, params); | 6505 | bnx2x_set_parallel_detection(phy, params); |
6506 | if (params->phy[INT_PHY].config_init) | 6506 | if (params->phy[INT_PHY].config_init) |
6507 | params->phy[INT_PHY].config_init(phy, | 6507 | params->phy[INT_PHY].config_init(phy, params, vars); |
6508 | params, | ||
6509 | vars); | ||
6510 | } | ||
6511 | } | 6508 | } |
6512 | 6509 | ||
6513 | /* Init external phy*/ | 6510 | /* Init external phy*/ |