diff options
author | Jiri Pirko <jiri@resnulli.us> | 2015-01-13 11:13:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-13 17:51:08 -0500 |
commit | df8a39defad46b83694ea6dd868d332976d62cc0 (patch) | |
tree | fe19bca0c2788033d49686babfc7b3853fa13340 /drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |
parent | d8b9605d2697c48fb822c821c5751afbb4567003 (diff) |
net: rename vlan_tx_* helpers since "tx" is misleading there
The same macros are used for rx as well. So rename it.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index c88abf5b6415..59a03a193e83 100644 --- 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, | |||
1892 | 1892 | ||
1893 | tpd = atl1e_get_tpd(adapter); | 1893 | tpd = atl1e_get_tpd(adapter); |
1894 | 1894 | ||
1895 | if (vlan_tx_tag_present(skb)) { | 1895 | if (skb_vlan_tag_present(skb)) { |
1896 | u16 vlan_tag = vlan_tx_tag_get(skb); | 1896 | u16 vlan_tag = skb_vlan_tag_get(skb); |
1897 | u16 atl1e_vlan_tag; | 1897 | u16 atl1e_vlan_tag; |
1898 | 1898 | ||
1899 | tpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT; | 1899 | tpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT; |