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>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 664568420c9bdd08869e33802ee8c208e307c082..d60a2ea3da192a203a18cda07251c3e2ee60ab42 100644 (file)
--- 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,
                struct bnx2x_phy *phy = &params->phy[INT_PHY];
                if (vars->line_speed == SPEED_AUTO_NEG &&
                    (CHIP_IS_E1x(bp) ||
-                    CHIP_IS_E2(bp))) {
+                    CHIP_IS_E2(bp)))
                        bnx2x_set_parallel_detection(phy, params);
-                       if (params->phy[INT_PHY].config_init)
-                               params->phy[INT_PHY].config_init(phy,
-                                                                params,
-                                                                vars);
-               }
+               if (params->phy[INT_PHY].config_init)
+                       params->phy[INT_PHY].config_init(phy, params, vars);
        }
 
        /* Init external phy*/