Merge tag 'powerpc-4.13-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / net / mpls / mpls_gso.c

diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c
index 2055e57ed1c3a32297f521e35e0cd078562e8bbe..b4da6d8e8632c5a31fe293a72c2ad2e0fb98b0e4 100644 (file)
--- a/net/mpls/mpls_gso.c
+++ b/net/mpls/mpls_gso.c
@@ -23,32 +23,50 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
                                       netdev_features_t features)
 {
        struct sk_buff *segs = ERR_PTR(-EINVAL);
+       u16 mac_offset = skb->mac_header;
        netdev_features_t mpls_features;
+       u16 mac_len = skb->mac_len;
        __be16 mpls_protocol;
+       unsigned int mpls_hlen;
+
+       skb_reset_network_header(skb);
+       mpls_hlen = skb_inner_network_header(skb) - skb_network_header(skb);
+       if (unlikely(!pskb_may_pull(skb, mpls_hlen)))
+               goto out;
 
        /* Setup inner SKB. */
        mpls_protocol = skb->protocol;
        skb->protocol = skb->inner_protocol;
 
-       /* Push back the mac header that skb_mac_gso_segment() has pulled.
-        * It will be re-pulled by the call to skb_mac_gso_segment() below
-        */
-       __skb_push(skb, skb->mac_len);
+       __skb_pull(skb, mpls_hlen);
+
+       skb->mac_len = 0;
+       skb_reset_mac_header(skb);
 
        /* Segment inner packet. */
        mpls_features = skb->dev->mpls_features & features;
        segs = skb_mac_gso_segment(skb, mpls_features);
+       if (IS_ERR_OR_NULL(segs)) {
+               skb_gso_error_unwind(skb, mpls_protocol, mpls_hlen, mac_offset,
+                                    mac_len);
+               goto out;
+       }
+       skb = segs;
+
+       mpls_hlen += mac_len;
+       do {
+               skb->mac_len = mac_len;
+               skb->protocol = mpls_protocol;
 
+               skb_reset_inner_network_header(skb);
 
-       /* Restore outer protocol. */
-       skb->protocol = mpls_protocol;
+               __skb_push(skb, mpls_hlen);
 
-       /* Re-pull the mac header that the call to skb_mac_gso_segment()
-        * above pulled.  It will be re-pushed after returning
-        * skb_mac_gso_segment(), an indirect caller of this function.
-        */
-       __skb_pull(skb, skb->data - skb_mac_header(skb));
+               skb_reset_mac_header(skb);
+               skb_set_network_header(skb, mac_len);
+       } while ((skb = skb->next));
 
+out:
        return segs;
 }