vlan: introduce *vlan_hwaccel_push_inside helpers

Use them to push skb->vlan_tci into the payload and avoid code
duplication.

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>

2 files changed, 5 insertions, 11 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index c63e60e4d947..f37ca3e5824c 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -425,12 +425,10 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
                 if (!nskb)
                         return -ENOMEM;
 
-                nskb = vlan_insert_tag_set_proto(nskb, nskb->vlan_proto,
-                                                 vlan_tx_tag_get(nskb));
+                nskb = __vlan_hwaccel_push_inside(nskb);
                 if (!nskb)
                         return -ENOMEM;
 
-                nskb->vlan_tci = 0;
                 skb = nskb;
         }
 
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 777cd8c71d53..6b69df545b1d 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -175,14 +175,10 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
                         goto err_free_rt;
         }
 
-        if (vlan_tx_tag_present(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;
-                }
-                skb->vlan_tci = 0;
+        skb = vlan_hwaccel_push_inside(skb);
+        if (unlikely(!skb)) {
+                err = -ENOMEM;
+                goto err_free_rt;
         }
 
         /* Push Tunnel header. */