ipv6: Allow for partial checksums on non-ufo packets

[karo-tx-linux.git] / net / ipv6 / ip6_output.c

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b89d3c27dac7a5001084a7430b0c8e2a5b7a3dc2..1a036f35d833e2555b915fadcd66317676eeeac8 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1227,6 +1227,7 @@ static int __ip6_append_data(struct sock *sk,
        u32 tskey = 0;
        struct rt6_info *rt = (struct rt6_info *)cork->dst;
        struct ipv6_txoptions *opt = v6_cork->opt;
+       int csummode = CHECKSUM_NONE;
 
        skb = skb_peek_tail(queue);
        if (!skb) {
@@ -1283,6 +1284,14 @@ emsgsize:
                        tskey = sk->sk_tskey++;
        }
 
+       /* If this is the first and only packet and device
+        * supports checksum offloading, let's use it.
+        */
+       if (!skb &&
+           length + fragheaderlen < mtu &&
+           rt->dst.dev->features & NETIF_F_V6_CSUM &&
+           !exthdrlen)
+               csummode = CHECKSUM_PARTIAL;
        /*
         * Let's try using as much space as possible.
         * Use MTU if total length of the message fits into the MTU.
@@ -1395,7 +1404,7 @@ alloc_new_skb:
                         *      Fill in the control structures
                         */
                        skb->protocol = htons(ETH_P_IPV6);
-                       skb->ip_summed = CHECKSUM_NONE;
+                       skb->ip_summed = csummode;
                        skb->csum = 0;
                        /* reserve for fragmentation and ipsec header */
                        skb_reserve(skb, hh_len + sizeof(struct frag_hdr) +