diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index bf27c54ff2e0..0dd22bb44f0d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -984,10 +984,11 @@ static inline int bnx2x_func_start(struct bnx2x *bp) | |||
984 | /* Function parameters */ | 984 | /* Function parameters */ |
985 | start_params->mf_mode = bp->mf_mode; | 985 | start_params->mf_mode = bp->mf_mode; |
986 | start_params->sd_vlan_tag = bp->mf_ov; | 986 | start_params->sd_vlan_tag = bp->mf_ov; |
987 | if (CHIP_IS_E1x(bp)) | 987 | |
988 | start_params->network_cos_mode = OVERRIDE_COS; | 988 | if (CHIP_IS_E2(bp) || CHIP_IS_E3(bp)) |
989 | else | ||
990 | start_params->network_cos_mode = STATIC_COS; | 989 | start_params->network_cos_mode = STATIC_COS; |
990 | else /* CHIP_IS_E1X */ | ||
991 | start_params->network_cos_mode = FW_WRR; | ||
991 | 992 | ||
992 | return bnx2x_func_state_change(bp, &func_params); | 993 | return bnx2x_func_state_change(bp, &func_params); |
993 | } | 994 | } |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h index 66da39f0c84a..f33bc5722e58 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | |||
@@ -803,10 +803,10 @@ enum bnx2x_q_type { | |||
803 | }; | 803 | }; |
804 | 804 | ||
805 | #define BNX2X_PRIMARY_CID_INDEX 0 | 805 | #define BNX2X_PRIMARY_CID_INDEX 0 |
806 | #define BNX2X_MULTI_TX_COS_E1X 1 | 806 | #define BNX2X_MULTI_TX_COS_E1X 3 /* QM only */ |
807 | #define BNX2X_MULTI_TX_COS_E2_E3A0 2 | 807 | #define BNX2X_MULTI_TX_COS_E2_E3A0 2 |
808 | #define BNX2X_MULTI_TX_COS_E3B0 3 | 808 | #define BNX2X_MULTI_TX_COS_E3B0 3 |
809 | #define BNX2X_MULTI_TX_COS BNX2X_MULTI_TX_COS_E3B0 | 809 | #define BNX2X_MULTI_TX_COS 3 /* Maximum possible */ |
810 | 810 | ||
811 | 811 | ||
812 | struct bnx2x_queue_init_params { | 812 | struct bnx2x_queue_init_params { |