diff options
Diffstat (limited to 'drivers/net/bnx2x')
-rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 4 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 2 | ||||
-rw-r--r-- | drivers/net/bnx2x/bnx2x_reg.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index e56a45c3e73..8e4183717d9 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
@@ -1415,12 +1415,12 @@ struct bnx2x_func_init_params { | |||
1415 | else | 1415 | else |
1416 | 1416 | ||
1417 | /* skip rx queue | 1417 | /* skip rx queue |
1418 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1418 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1419 | */ | 1419 | */ |
1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1421 | 1421 | ||
1422 | /* skip tx queue | 1422 | /* skip tx queue |
1423 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1423 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1424 | */ | 1424 | */ |
1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1426 | 1426 | ||
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 84e1af4d65e..8cdcf5b39d1 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
@@ -5037,7 +5037,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code) | |||
5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); | 5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); |
5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); | 5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); |
5039 | 5039 | ||
5040 | /* initalize dummy TM client */ | 5040 | /* initialize dummy TM client */ |
5041 | ilt_cli.start = 0; | 5041 | ilt_cli.start = 0; |
5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; | 5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; |
5043 | ilt_cli.client_num = ILT_CLIENT_TM; | 5043 | ilt_cli.client_num = ILT_CLIENT_TM; |
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index 73efc9bbfe7..e01330bb36c 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h | |||
@@ -1633,7 +1633,7 @@ | |||
1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ | 1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ |
1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc | 1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc |
1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses | 1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses |
1636 | in this register. addres 0 - timer 1; address 1 - timer 2, ... address 7 - | 1636 | in this register. address 0 - timer 1; address 1 - timer 2, ... address 7 - |
1637 | timer 8 */ | 1637 | timer 8 */ |
1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 | 1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 |
1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are | 1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are |