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>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index da2fae0873a5..df334fe43d7f 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -70,7 +70,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
 {
         struct flow_stats *stats;
         int node = numa_node_id();
-        int len = skb->len + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
+        int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
 
         stats = rcu_dereference(flow->stats[node]);
 
@@ -472,7 +472,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
          */
 
         key->eth.tci = 0;
-        if (vlan_tx_tag_present(skb))
+        if (skb_vlan_tag_present(skb))
                 key->eth.tci = htons(skb->vlan_tci);
         else if (eth->h_proto == htons(ETH_P_8021Q))
                 if (unlikely(parse_vlan(skb, key)))