Merge branch 'topic/ppc-kvm' into next

[linux-2.6-microblaze.git] / net / ipv6 / ip6_offload.c

diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index c4fc03c..d12dba2 100644 (file)
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -77,7 +77,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
        struct sk_buff *segs = ERR_PTR(-EINVAL);
        struct ipv6hdr *ipv6h;
        const struct net_offload *ops;
-       int proto;
+       int proto, nexthdr;
        struct frag_hdr *fptr;
        unsigned int payload_len;
        u8 *prevhdr;
@@ -87,6 +87,28 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
        bool gso_partial;
 
        skb_reset_network_header(skb);
+       nexthdr = ipv6_has_hopopt_jumbo(skb);
+       if (nexthdr) {
+               const int hophdr_len = sizeof(struct hop_jumbo_hdr);
+               int err;
+
+               err = skb_cow_head(skb, 0);
+               if (err < 0)
+                       return ERR_PTR(err);
+
+               /* remove the HBH header.
+                * Layout: [Ethernet header][IPv6 header][HBH][TCP header]
+                */
+               memmove(skb_mac_header(skb) + hophdr_len,
+                       skb_mac_header(skb),
+                       ETH_HLEN + sizeof(struct ipv6hdr));
+               skb->data += hophdr_len;
+               skb->len -= hophdr_len;
+               skb->network_header += hophdr_len;
+               skb->mac_header += hophdr_len;
+               ipv6h = (struct ipv6hdr *)skb->data;
+               ipv6h->nexthdr = nexthdr;
+       }
        nhoff = skb_network_header(skb) - skb_mac_header(skb);
        if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))
                goto out;
@@ -320,15 +342,43 @@ static struct sk_buff *ip4ip6_gro_receive(struct list_head *head,
 INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff)
 {
        const struct net_offload *ops;
-       struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + nhoff);
+       struct ipv6hdr *iph;
        int err = -ENOSYS;
+       u32 payload_len;
 
        if (skb->encapsulation) {
                skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IPV6));
                skb_set_inner_network_header(skb, nhoff);
        }
 
-       iph->payload_len = htons(skb->len - nhoff - sizeof(*iph));
+       payload_len = skb->len - nhoff - sizeof(*iph);
+       if (unlikely(payload_len > IPV6_MAXPLEN)) {
+               struct hop_jumbo_hdr *hop_jumbo;
+               int hoplen = sizeof(*hop_jumbo);
+
+               /* Move network header left */
+               memmove(skb_mac_header(skb) - hoplen, skb_mac_header(skb),
+                       skb->transport_header - skb->mac_header);
+               skb->data -= hoplen;
+               skb->len += hoplen;
+               skb->mac_header -= hoplen;
+               skb->network_header -= hoplen;
+               iph = (struct ipv6hdr *)(skb->data + nhoff);
+               hop_jumbo = (struct hop_jumbo_hdr *)(iph + 1);
+
+               /* Build hop-by-hop options */
+               hop_jumbo->nexthdr = iph->nexthdr;
+               hop_jumbo->hdrlen = 0;
+               hop_jumbo->tlv_type = IPV6_TLV_JUMBO;
+               hop_jumbo->tlv_len = 4;
+               hop_jumbo->jumbo_payload_len = htonl(payload_len + hoplen);
+
+               iph->nexthdr = NEXTHDR_HOP;
+               iph->payload_len = 0;
+       } else {
+               iph = (struct ipv6hdr *)(skb->data + nhoff);
+               iph->payload_len = htons(payload_len);
+       }
 
        nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops);
        if (WARN_ON(!ops || !ops->callbacks.gro_complete))