vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

[firefly-linux-kernel-4.4.55.git] / drivers / net / vxlan.c

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 23b1e8c0d547517edb6d8e124bfccd3e63c8a677..bb8fbab438e83623bed2922fb69d3650091dbc80 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1600,9 +1600,9 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs,
                return err;
 
        if (vlan_tx_tag_present(skb)) {
-               if (WARN_ON(!__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 (WARN_ON(!skb))
                        return -ENOMEM;
 
                skb->vlan_tci = 0;
@@ -1644,9 +1644,9 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
                return err;
 
        if (vlan_tx_tag_present(skb)) {
-               if (WARN_ON(!__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 (WARN_ON(!skb))
                        return -ENOMEM;
 
                skb->vlan_tci = 0;