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>

diff --cc drivers/infiniband/hw/mlx4/cq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge

diff --cc include/linux/mlx4/cq.h
Simple merge

diff --cc include/linux/mlx4/qp.h
Simple merge