vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

[firefly-linux-kernel-4.4.55.git] / net / openvswitch / actions.c

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 749a30163071effc9219e370000fcbdad51b80b6..426b9131ede03c116bc5d4f96141f0d0cd84fcf0 100644 (file)
--- 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;