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)
         /* Function parameters */
         start_params->mf_mode = bp->mf_mode;
         start_params->sd_vlan_tag = bp->mf_ov;
-        if (CHIP_IS_E1x(bp))
-                start_params->network_cos_mode = OVERRIDE_COS;
-        else
+
+        if (CHIP_IS_E2(bp) || CHIP_IS_E3(bp))
                 start_params->network_cos_mode = STATIC_COS;
+        else /* CHIP_IS_E1X */
+                start_params->network_cos_mode = FW_WRR;
 
         return bnx2x_func_state_change(bp, &func_params);
 }
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 {
 };
 
 #define BNX2X_PRIMARY_CID_INDEX                 0
-#define BNX2X_MULTI_TX_COS_E1X                  1
+#define BNX2X_MULTI_TX_COS_E1X                  3 /* QM only */
 #define BNX2X_MULTI_TX_COS_E2_E3A0              2
 #define BNX2X_MULTI_TX_COS_E3B0                 3
-#define BNX2X_MULTI_TX_COS                      BNX2X_MULTI_TX_COS_E3B0
+#define BNX2X_MULTI_TX_COS                      3 /* Maximum possible */
 
 
 struct bnx2x_queue_init_params {