aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cisco
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2015-01-13 11:13:44 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-13 17:51:08 -0500
commitdf8a39defad46b83694ea6dd868d332976d62cc0 (patch)
treefe19bca0c2788033d49686babfc7b3853fa13340 /drivers/net/ethernet/cisco
parentd8b9605d2697c48fb822c821c5751afbb4567003 (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/cisco')
-rw-r--r--drivers/net/ethernet/cisco/enic/enic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 9a952df6606e..0535f6fbdc71 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -520,10 +520,10 @@ static inline void enic_queue_wq_skb(struct enic *enic,
520 int loopback = 0; 520 int loopback = 0;
521 int err; 521 int err;
522 522
523 if (vlan_tx_tag_present(skb)) { 523 if (skb_vlan_tag_present(skb)) {
524 /* VLAN tag from trunking driver */ 524 /* VLAN tag from trunking driver */
525 vlan_tag_insert = 1; 525 vlan_tag_insert = 1;
526 vlan_tag = vlan_tx_tag_get(skb); 526 vlan_tag = skb_vlan_tag_get(skb);
527 } else if (enic->loop_enable) { 527 } else if (enic->loop_enable) {
528 vlan_tag = enic->loop_tag; 528 vlan_tag = enic->loop_tag;
529 loopback = 1; 529 loopback = 1;