diff options
author | Hadar Hen Zion <hadarh@mellanox.com> | 2015-07-27 13:46:33 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-28 00:00:37 +0200 |
commit | e802f8e4c54e6adf4215ef9fa3d6eea8fcb10bf9 (patch) | |
tree | 78b652b4b48ef6e99111d0b6365ef3adbf5649ee /drivers/infiniband/hw/mlx4/cq.c | |
parent | net/mlx4_en: Prepare ethtool private flags to support more flags (diff) | |
download | linux-e802f8e4c54e6adf4215ef9fa3d6eea8fcb10bf9.tar.xz linux-e802f8e4c54e6adf4215ef9fa3d6eea8fcb10bf9.zip |
net/mlx4: Prepare VLAN macros for 802.1ad Hardware accelerated support
To add Hardware accelerated support in 802.1ad vlan, replace
Current VLAN macros to CVLAN.
Replace:
MLX4_WQE_CTRL_INS_VLAN
MLX4_CQE_VLAN_PRESENT_MASK
With:
MLX4_WQE_CTRL_INS_CVLAN
MLX4_CQE_CVLAN_PRESENT_MASK
Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/cq.c')
-rw-r--r-- | drivers/infiniband/hw/mlx4/cq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index 36eb3d012b6d..180a8f7ec82d 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -871,7 +871,7 @@ repoll: if (is_eth) { wc->sl = be16_to_cpu(cqe->sl_vid) >> 13; if (be32_to_cpu(cqe->vlan_my_qpn) & - MLX4_CQE_VLAN_PRESENT_MASK) { + MLX4_CQE_CVLAN_PRESENT_MASK) { wc->vlan_id = be16_to_cpu(cqe->sl_vid) & MLX4_CQE_VID_MASK; } else { |