net: gro: use cb instead of skb->network_header

[linux-block.git] / net / ipv6 / ip6_offload.c

diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index c8b909a9904f321b91c9cfef46da9bb491c18a7d..288c7c6ea50f3373c142a1425fc7b8a6c7e9f0d2 100644 (file)
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -67,7 +67,7 @@ static int ipv6_gro_pull_exthdrs(struct sk_buff *skb, int off, int proto)
                off += len;
        }
 
-       skb_gro_pull(skb, off - skb_network_offset(skb));
+       skb_gro_pull(skb, off - skb_gro_receive_network_offset(skb));
        return proto;
 }
 
@@ -236,7 +236,6 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head,
        if (unlikely(!iph))
                goto out;
 
-       skb_set_network_header(skb, off);
        NAPI_GRO_CB(skb)->inner_network_offset = off;
 
        flush += ntohs(iph->payload_len) != skb->len - hlen;
@@ -260,7 +259,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head,
        NAPI_GRO_CB(skb)->proto = proto;
 
        flush--;
-       nlen = skb_network_header_len(skb);
+       nlen = skb_gro_offset(skb) - off;
 
        list_for_each_entry(p, head, list) {
                const struct ipv6hdr *iph2;