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/ibm | |
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/ibm')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 566b17db135a..e8a1adb7a962 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -2064,9 +2064,9 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2064 | memset(swqe, 0, SWQE_HEADER_SIZE); | 2064 | memset(swqe, 0, SWQE_HEADER_SIZE); |
2065 | atomic_dec(&pr->swqe_avail); | 2065 | atomic_dec(&pr->swqe_avail); |
2066 | 2066 | ||
2067 | if (vlan_tx_tag_present(skb)) { | 2067 | if (skb_vlan_tag_present(skb)) { |
2068 | swqe->tx_control |= EHEA_SWQE_VLAN_INSERT; | 2068 | swqe->tx_control |= EHEA_SWQE_VLAN_INSERT; |
2069 | swqe->vlan_tag = vlan_tx_tag_get(skb); | 2069 | swqe->vlan_tag = skb_vlan_tag_get(skb); |
2070 | } | 2070 | } |
2071 | 2071 | ||
2072 | pr->tx_packets++; | 2072 | pr->tx_packets++; |