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>

1 files changed, 3 insertions, 1 deletions

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;