Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[karo-tx-linux.git] / include / linux / mlx4 / qp.h

diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 6486d880bdbf9525cecfe58d19df35210fefb883..4001c8249dbb7f74668fe5e5d935cfeb51ad1cc0 100644 (file)
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -54,7 +54,8 @@ enum mlx4_qp_optpar {
        MLX4_QP_OPTPAR_RETRY_COUNT              = 1 << 12,
        MLX4_QP_OPTPAR_RNR_RETRY                = 1 << 13,
        MLX4_QP_OPTPAR_ACK_TIMEOUT              = 1 << 14,
-       MLX4_QP_OPTPAR_SCHED_QUEUE              = 1 << 16
+       MLX4_QP_OPTPAR_SCHED_QUEUE              = 1 << 16,
+       MLX4_QP_OPTPAR_COUNTER_INDEX            = 1 << 20
 };
 
 enum mlx4_qp_state {