vlan: introduce *vlan_hwaccel_push_inside helpers

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / geneve.c

diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index fd430a6a1c377c884341381b43d0b1ee6c7d6256..a457232f0131c49d1a9fd574c683df8604f48e99 100644 (file)
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -131,14 +131,9 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
        if (unlikely(err))
                return err;
 
-       if (vlan_tx_tag_present(skb)) {
-               skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
-                                               vlan_tx_tag_get(skb));
-               if (unlikely(!skb)
-                       return -ENOMEM;
-
-               skb->vlan_tci = 0;
-       }
+       skb = vlan_hwaccel_push_inside(skb);
+       if (unlikely(!skb))
+               return -ENOMEM;
 
        gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);
        geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);