vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

Name fits better. Plus there's going to be introduced
__vlan_insert_tag later on.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 19 insertions, 17 deletions

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 150048fb99b0..97b8ddf57363 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -199,8 +199,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
                 if (skb->vlan_proto != proto) {
                         /* Protocol-mismatch, empty out vlan_tci for new tag */
                         skb_push(skb, ETH_HLEN);
-                        skb = __vlan_put_tag(skb, skb->vlan_proto,
-                                             vlan_tx_tag_get(skb));
+                        skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                        vlan_tx_tag_get(skb));
                         if (unlikely(!skb))
                                 return false;
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 1ab168e0fdf7..3611e60df407 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2645,8 +2645,8 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
 {
         if (vlan_tx_tag_present(skb) &&
             !vlan_hw_offload_capable(features, skb->vlan_proto)) {
-                skb = __vlan_put_tag(skb, skb->vlan_proto,
-                                     vlan_tx_tag_get(skb));
+                skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                vlan_tx_tag_get(skb));
                 if (skb)
                         skb->vlan_tci = 0;
         }
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index e6645b4f330a..65d372384a3f 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -79,8 +79,8 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
 
         if (vlan_tx_tag_present(skb) &&
             !vlan_hw_offload_capable(features, skb->vlan_proto)) {
-                skb = __vlan_put_tag(skb, skb->vlan_proto,
-                                     vlan_tx_tag_get(skb));
+                skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                vlan_tx_tag_get(skb));
                 if (unlikely(!skb)) {
                         /* This is actually a packet drop, but we
                          * don't want the code that calls this
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 31802afce34f..fd430a6a1c37 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -132,12 +132,11 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
                 return err;
 
         if (vlan_tx_tag_present(skb)) {
-                if (unlikely(!__vlan_put_tag(skb,
-                                             skb->vlan_proto,
-                                             vlan_tx_tag_get(skb)))) {
-                        err = -ENOMEM;
-                        return err;
-                }
+                skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                vlan_tx_tag_get(skb));
+                if (unlikely(!skb)
+                        return -ENOMEM;
+
                 skb->vlan_tci = 0;
         }
 
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 749a30163071..426b9131ede0 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -287,7 +287,9 @@ static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key,
                 /* push down current VLAN tag */
                 current_tag = vlan_tx_tag_get(skb);
 
-                if (!__vlan_put_tag(skb, skb->vlan_proto, current_tag))
+                skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                current_tag);
+                if (!skb)
                         return -ENOMEM;
                 /* Update mac_len for subsequent MPLS actions */
                 skb->mac_len += VLAN_HLEN;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index ab141d49bb9d..c63e60e4d947 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -425,7 +425,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
                 if (!nskb)
                         return -ENOMEM;
 
-                nskb = __vlan_put_tag(nskb, nskb->vlan_proto, vlan_tx_tag_get(nskb));
+                nskb = vlan_insert_tag_set_proto(nskb, nskb->vlan_proto,
+                                                 vlan_tx_tag_get(nskb));
                 if (!nskb)
                         return -ENOMEM;
 
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 8e61a5c6ae7c..777cd8c71d53 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -176,9 +176,9 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
         }
 
         if (vlan_tx_tag_present(skb)) {
-                if (unlikely(!__vlan_put_tag(skb,
-                                             skb->vlan_proto,
-                                             vlan_tx_tag_get(skb)))) {
+                skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
+                                                vlan_tx_tag_get(skb));
+                if (unlikely(!skb) {
                         err = -ENOMEM;
                         goto err_free_rt;
                 }