diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-02 15:27:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-02 15:27:23 -0500 |
| commit | eee617a1c35dbf598690879f13dc3df548fd6ea6 (patch) | |
| tree | 587a55ff547e7db7ad5e38637fc484bb146f9c0d /include | |
| parent | 38674a49f33a9b3ce4eafb8bbd4b18744b3943f9 (diff) | |
| parent | 1037ebbbd262227a91dfdd558159e345d4edf6b7 (diff) | |
Merge branch 'mlx4'
Or Gerlitz says:
====================
Mellanox driver fixes
Two small fixes, please apply to net.
Both patches should go to 3.19.y too.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx4/qp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h index 2bbc62aa818a..551f85456c11 100644 --- a/include/linux/mlx4/qp.h +++ b/include/linux/mlx4/qp.h @@ -427,7 +427,7 @@ struct mlx4_wqe_inline_seg { enum mlx4_update_qp_attr { MLX4_UPDATE_QP_SMAC = 1 << 0, - MLX4_UPDATE_QP_VSD = 1 << 2, + MLX4_UPDATE_QP_VSD = 1 << 1, MLX4_UPDATE_QP_SUPPORTED_ATTRS = (1 << 2) - 1 }; |