diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 7dd83d0ef0a0..98d4c5a3ff21 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
| @@ -588,7 +588,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params, | |||
| 588 | * slots for the highest priority. | 588 | * slots for the highest priority. |
| 589 | */ | 589 | */ |
| 590 | REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS : | 590 | REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS : |
| 591 | NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100); | 591 | NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100); |
| 592 | /* Mapping between the CREDIT_WEIGHT registers and actual client | 592 | /* Mapping between the CREDIT_WEIGHT registers and actual client |
| 593 | * numbers | 593 | * numbers |
| 594 | */ | 594 | */ |
| @@ -6339,6 +6339,7 @@ int bnx2x_set_led(struct link_params *params, | |||
| 6339 | */ | 6339 | */ |
| 6340 | if (!vars->link_up) | 6340 | if (!vars->link_up) |
| 6341 | break; | 6341 | break; |
| 6342 | /* else: fall through */ | ||
| 6342 | case LED_MODE_ON: | 6343 | case LED_MODE_ON: |
| 6343 | if (((params->phy[EXT_PHY1].type == | 6344 | if (((params->phy[EXT_PHY1].type == |
| 6344 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727) || | 6345 | PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727) || |
| @@ -12521,11 +12522,13 @@ static void bnx2x_phy_def_cfg(struct link_params *params, | |||
| 12521 | switch (link_config & PORT_FEATURE_LINK_SPEED_MASK) { | 12522 | switch (link_config & PORT_FEATURE_LINK_SPEED_MASK) { |
| 12522 | case PORT_FEATURE_LINK_SPEED_10M_HALF: | 12523 | case PORT_FEATURE_LINK_SPEED_10M_HALF: |
| 12523 | phy->req_duplex = DUPLEX_HALF; | 12524 | phy->req_duplex = DUPLEX_HALF; |
| 12525 | /* fall through */ | ||
| 12524 | case PORT_FEATURE_LINK_SPEED_10M_FULL: | 12526 | case PORT_FEATURE_LINK_SPEED_10M_FULL: |
| 12525 | phy->req_line_speed = SPEED_10; | 12527 | phy->req_line_speed = SPEED_10; |
| 12526 | break; | 12528 | break; |
| 12527 | case PORT_FEATURE_LINK_SPEED_100M_HALF: | 12529 | case PORT_FEATURE_LINK_SPEED_100M_HALF: |
| 12528 | phy->req_duplex = DUPLEX_HALF; | 12530 | phy->req_duplex = DUPLEX_HALF; |
| 12531 | /* fall through */ | ||
| 12529 | case PORT_FEATURE_LINK_SPEED_100M_FULL: | 12532 | case PORT_FEATURE_LINK_SPEED_100M_FULL: |
| 12530 | phy->req_line_speed = SPEED_100; | 12533 | phy->req_line_speed = SPEED_100; |
| 12531 | break; | 12534 | break; |
