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>

3 files changed, 10 insertions, 10 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 805456147c30..1e325adc4367 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2578,7 +2578,7 @@ netdev_features_t netif_skb_features(struct sk_buff *skb)
         if (skb->encapsulation)
                 features &= dev->hw_enc_features;
 
-        if (!vlan_tx_tag_present(skb)) {
+        if (!skb_vlan_tag_present(skb)) {
                 if (unlikely(protocol == htons(ETH_P_8021Q) ||
                              protocol == htons(ETH_P_8021AD))) {
                         struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
@@ -2659,7 +2659,7 @@ out:
 static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
                                           netdev_features_t features)
 {
-        if (vlan_tx_tag_present(skb) &&
+        if (skb_vlan_tag_present(skb) &&
             !vlan_hw_offload_capable(features, skb->vlan_proto))
                 skb = __vlan_hwaccel_push_inside(skb);
         return skb;
@@ -3676,7 +3676,7 @@ ncls:
         if (pfmemalloc && !skb_pfmemalloc_protocol(skb))
                 goto drop;
 
-        if (vlan_tx_tag_present(skb)) {
+        if (skb_vlan_tag_present(skb)) {
                 if (pt_prev) {
                         ret = deliver_skb(skb, pt_prev, orig_dev);
                         pt_prev = NULL;
@@ -3708,8 +3708,8 @@ ncls:
                 }
         }
 
-        if (unlikely(vlan_tx_tag_present(skb))) {
-                if (vlan_tx_tag_get_id(skb))
+        if (unlikely(skb_vlan_tag_present(skb))) {
+                if (skb_vlan_tag_get_id(skb))
                         skb->pkt_type = PACKET_OTHERHOST;
                 /* Note: we might in the future use prio bits
                  * and set skb->priority like in vlan_do_receive()
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index e0ad5d16c9c5..c126a878c47c 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -77,7 +77,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
 
         features = netif_skb_features(skb);
 
-        if (vlan_tx_tag_present(skb) &&
+        if (skb_vlan_tag_present(skb) &&
             !vlan_hw_offload_capable(features, skb->vlan_proto)) {
                 skb = __vlan_hwaccel_push_inside(skb);
                 if (unlikely(!skb)) {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5a2a2e887a12..56db472e9b86 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4197,7 +4197,7 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb)
         struct vlan_hdr *vhdr;
         u16 vlan_tci;
 
-        if (unlikely(vlan_tx_tag_present(skb))) {
+        if (unlikely(skb_vlan_tag_present(skb))) {
                 /* vlan_tci is already set-up so leave this for another time */
                 return skb;
         }
@@ -4283,7 +4283,7 @@ int skb_vlan_pop(struct sk_buff *skb)
         __be16 vlan_proto;
         int err;
 
-        if (likely(vlan_tx_tag_present(skb))) {
+        if (likely(skb_vlan_tag_present(skb))) {
                 skb->vlan_tci = 0;
         } else {
                 if (unlikely((skb->protocol != htons(ETH_P_8021Q) &&
@@ -4313,7 +4313,7 @@ EXPORT_SYMBOL(skb_vlan_pop);
 
 int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
 {
-        if (vlan_tx_tag_present(skb)) {
+        if (skb_vlan_tag_present(skb)) {
                 unsigned int offset = skb->data - skb_mac_header(skb);
                 int err;
 
@@ -4323,7 +4323,7 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
                  */
                 __skb_push(skb, offset);
                 err = __vlan_insert_tag(skb, skb->vlan_proto,
-                                        vlan_tx_tag_get(skb));
+                                        skb_vlan_tag_get(skb));
                 if (err)
                         return err;
                 skb->protocol = skb->vlan_proto;