Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells...

[karo-tx-linux.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 6537a408a4fb451d906b574def4746c064399fd9..3e98ed2bff55d7328aae7209ecbda4f78445c87a 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -595,6 +595,10 @@ slow_path_clean:
        }
 
 slow_path:
+       /* for offloaded checksums cleanup checksum before fragmentation */
+       if ((skb->ip_summed == CHECKSUM_PARTIAL) && skb_checksum_help(skb))
+               goto fail;
+
        left = skb->len - hlen;         /* Space per frame */
        ptr = hlen;             /* Where to start from */