1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index e3357bf523df..359bb1286eb5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -682,8 +682,8 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
         if (dev->num_tc)
                 return skb_tx_hash(dev, skb);
 
-        if (vlan_tx_tag_present(skb))
-                up = vlan_tx_tag_get(skb) >> VLAN_PRIO_SHIFT;
+        if (skb_vlan_tag_present(skb))
+                up = skb_vlan_tag_get(skb) >> VLAN_PRIO_SHIFT;
 
         return fallback(dev, skb) % rings_p_up + up * rings_p_up;
 }
@@ -742,8 +742,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto tx_drop;
         }
 
-        if (vlan_tx_tag_present(skb))
-                vlan_tag = vlan_tx_tag_get(skb);
+        if (skb_vlan_tag_present(skb))
+                vlan_tag = skb_vlan_tag_get(skb);
 
 
         netdev_txq_bql_enqueue_prefetchw(ring->tx_queue);
@@ -930,7 +930,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         real_size = (real_size / 16) & 0x3f;
 
         if (ring->bf_enabled && desc_size <= MAX_BF && !bounce &&
-            !vlan_tx_tag_present(skb) && send_doorbell) {
+            !skb_vlan_tag_present(skb) && send_doorbell) {
                 tx_desc->ctrl.bf_qpn = ring->doorbell_qpn |
                                        cpu_to_be32(real_size);
 
@@ -952,7 +952,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         } else {
                 tx_desc->ctrl.vlan_tag = cpu_to_be16(vlan_tag);
                 tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN *
-                        !!vlan_tx_tag_present(skb);
+                        !!skb_vlan_tag_present(skb);
                 tx_desc->ctrl.fence_size = real_size;
 
                 /* Ensure new descriptor hits memory