gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol()

[~andy/linux] / net / ipv4 / gre.c

diff --git a/net/ipv4/gre.c b/net/ipv4/gre.c
index d2d5a99fba0983a4dead0909e30212c84f72154b..b2e805af9b87a03675d7bac1a7e210124757e566 100644 (file)
--- a/net/ipv4/gre.c
+++ b/net/ipv4/gre.c
@@ -121,6 +121,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
        int ghl = GRE_HEADER_SECTION;
        struct gre_base_hdr *greh;
        int mac_len = skb->mac_len;
+       __be16 protocol = skb->protocol;
        int tnl_hlen;
        bool csum;
 
@@ -149,13 +150,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                csum = false;
 
        /* setup inner skb. */
-       if (greh->protocol == htons(ETH_P_TEB)) {
-               struct ethhdr *eth = eth_hdr(skb);
-               skb->protocol = eth->h_proto;
-       } else {
-               skb->protocol = greh->protocol;
-       }
-
+       skb->protocol = greh->protocol;
        skb->encapsulation = 0;
 
        if (unlikely(!pskb_may_pull(skb, ghl)))
@@ -199,6 +194,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                skb_reset_mac_header(skb);
                skb_set_network_header(skb, mac_len);
                skb->mac_len = mac_len;
+               skb->protocol = protocol;
        } while ((skb = skb->next));
 out:
        return segs;