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

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / atheros / atl1e / atl1e_main.c

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 2326579f94540568226bb4987759a2554fc5e6d3..59a03a193e8354285f838f6f47c3bc081cc18bdf 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -1892,8 +1892,8 @@ static netdev_tx_t atl1e_xmit_frame(struct sk_buff *skb,
 
        tpd = atl1e_get_tpd(adapter);
 
-       if (vlan_tx_tag_present(skb)) {
-               u16 vlan_tag = vlan_tx_tag_get(skb);
+       if (skb_vlan_tag_present(skb)) {
+               u16 vlan_tag = skb_vlan_tag_get(skb);
                u16 atl1e_vlan_tag;
 
                tpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT;
@@ -2373,9 +2373,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64);
 
-       init_timer(&adapter->phy_config_timer);
-       adapter->phy_config_timer.function = atl1e_phy_config;
-       adapter->phy_config_timer.data = (unsigned long) adapter;
+       setup_timer(&adapter->phy_config_timer, atl1e_phy_config,
+                   (unsigned long)adapter);
 
        /* get user settings */
        atl1e_check_options(adapter);