vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

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

diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 8e61a5c6ae7c8f00c4ae9c2d4278035cd0481635..777cd8c71d536b93906b011ae3e05493e6acbf1e 100644 (file)
--- 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;
                }