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

[deliverable/linux.git] / drivers / net / ethernet / intel / ixgb / ixgb_main.c

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index aa87605b144a23a98d3ed7121c035c8703ad4627..11a1bdbe3fd9dcdd7e3da5094e34c83d1c151b56 100644 (file)
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1532,9 +1532,9 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                      DESC_NEEDED)))
                return NETDEV_TX_BUSY;
 
-       if (vlan_tx_tag_present(skb)) {
+       if (skb_vlan_tag_present(skb)) {
                tx_flags |= IXGB_TX_FLAGS_VLAN;
-               vlan_id = vlan_tx_tag_get(skb);
+               vlan_id = skb_vlan_tag_get(skb);
        }
 
        first = adapter->tx_ring.next_to_use;