i40iw: remove use of VLAN_TAG_PRESENT

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 771eb6bd0785482beb9b9ae031de94c6cb1b93ea..4b3999d88c9e645e3fa7b01214ebd53c46ffddac 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
@@ -404,7 +404,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node,
        if (pdata)
                pd_len = pdata->size;
 
-       if (cm_node->vlan_id < VLAN_TAG_PRESENT)
+       if (cm_node->vlan_id <= VLAN_VID_MASK)
                eth_hlen += 4;
 
        if (cm_node->ipv4)
@@ -433,7 +433,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node,
 
                ether_addr_copy(ethh->h_dest, cm_node->rem_mac);
                ether_addr_copy(ethh->h_source, cm_node->loc_mac);
-               if (cm_node->vlan_id < VLAN_TAG_PRESENT) {
+               if (cm_node->vlan_id <= VLAN_VID_MASK) {
                        ((struct vlan_ethhdr *)ethh)->h_vlan_proto = htons(ETH_P_8021Q);
                        vtag = (cm_node->user_pri << VLAN_PRIO_SHIFT) | cm_node->vlan_id;
                        ((struct vlan_ethhdr *)ethh)->h_vlan_TCI = htons(vtag);
@@ -463,7 +463,7 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node,
 
                ether_addr_copy(ethh->h_dest, cm_node->rem_mac);
                ether_addr_copy(ethh->h_source, cm_node->loc_mac);
-               if (cm_node->vlan_id < VLAN_TAG_PRESENT) {
+               if (cm_node->vlan_id <= VLAN_VID_MASK) {
                        ((struct vlan_ethhdr *)ethh)->h_vlan_proto = htons(ETH_P_8021Q);
                        vtag = (cm_node->user_pri << VLAN_PRIO_SHIFT) | cm_node->vlan_id;
                        ((struct vlan_ethhdr *)ethh)->h_vlan_TCI = htons(vtag);
@@ -3323,7 +3323,7 @@ static void i40iw_init_tcp_ctx(struct i40iw_cm_node *cm_node,
 
        tcp_info->flow_label = 0;
        tcp_info->snd_mss = cpu_to_le32(((u32)cm_node->tcp_cntxt.mss));
-       if (cm_node->vlan_id < VLAN_TAG_PRESENT) {
+       if (cm_node->vlan_id <= VLAN_VID_MASK) {
                tcp_info->insert_vlan_tag = true;
                tcp_info->vlan_tag = cpu_to_le16(((u16)cm_node->user_pri << I40IW_VLAN_PRIO_SHIFT) |
                                                  cm_node->vlan_id);