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, 6 insertions, 6 deletions

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 0f02668dc219..d37075b0d6d5 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -986,8 +986,8 @@ static void prb_clear_rxhash(struct tpacket_kbdq_core *pkc,
 static void prb_fill_vlan_info(struct tpacket_kbdq_core *pkc,
                         struct tpacket3_hdr *ppd)
 {
-        if (vlan_tx_tag_present(pkc->skb)) {
-                ppd->hv1.tp_vlan_tci = vlan_tx_tag_get(pkc->skb);
+        if (skb_vlan_tag_present(pkc->skb)) {
+                ppd->hv1.tp_vlan_tci = skb_vlan_tag_get(pkc->skb);
                 ppd->hv1.tp_vlan_tpid = ntohs(pkc->skb->vlan_proto);
                 ppd->tp_status = TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID;
         } else {
@@ -2000,8 +2000,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
                 h.h2->tp_net = netoff;
                 h.h2->tp_sec = ts.tv_sec;
                 h.h2->tp_nsec = ts.tv_nsec;
-                if (vlan_tx_tag_present(skb)) {
-                        h.h2->tp_vlan_tci = vlan_tx_tag_get(skb);
+                if (skb_vlan_tag_present(skb)) {
+                        h.h2->tp_vlan_tci = skb_vlan_tag_get(skb);
                         h.h2->tp_vlan_tpid = ntohs(skb->vlan_proto);
                         status |= TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID;
                 } else {
@@ -3010,8 +3010,8 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
                 aux.tp_snaplen = skb->len;
                 aux.tp_mac = 0;
                 aux.tp_net = skb_network_offset(skb);
-                if (vlan_tx_tag_present(skb)) {
-                        aux.tp_vlan_tci = vlan_tx_tag_get(skb);
+                if (skb_vlan_tag_present(skb)) {
+                        aux.tp_vlan_tci = skb_vlan_tag_get(skb);
                         aux.tp_vlan_tpid = ntohs(skb->vlan_proto);
                         aux.tp_status |= TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID;
                 } else {