net: rename vlan_tx_* helpers since "tx" is misleading there

[deliverable/linux.git] / drivers / net / ethernet / via / via-rhine.c

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index a191afc23b56c72bbdc6bf3379b646ba2ec72fdf..0ac76102b33dca861b67344ba1fbf320d2aa1f88 100644 (file)
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -1781,8 +1781,8 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
        rp->tx_ring[entry].desc_length =
                cpu_to_le32(TXDESC | (skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN));
 
-       if (unlikely(vlan_tx_tag_present(skb))) {
-               u16 vid_pcp = vlan_tx_tag_get(skb);
+       if (unlikely(skb_vlan_tag_present(skb))) {
+               u16 vid_pcp = skb_vlan_tag_get(skb);
 
                /* drop CFI/DEI bit, register needs VID and PCP */
                vid_pcp = (vid_pcp & VLAN_VID_MASK) |
@@ -1803,7 +1803,7 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
 
        /* Non-x86 Todo: explicitly flush cache lines here. */
 
-       if (vlan_tx_tag_present(skb))
+       if (skb_vlan_tag_present(skb))
                /* Tx queues are bits 7-0 (first Tx queue: bit 7) */
                BYTE_REG_BITS_ON(1 << 7, ioaddr + TQWake);