Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / sctp / output.c

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 73639355157e8bea9659b5539fb2d83f6c67a919..7d08f522ec844ea73f9e69dc4a7061d4f6885de3 100644 (file)
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -49,13 +49,10 @@
 #include <linux/ipv6.h>
 #include <linux/init.h>
 #include <net/inet_ecn.h>
+#include <net/ip.h>
 #include <net/icmp.h>
 #include <net/net_namespace.h>
 
-#ifndef TEST_FRAME
-#include <net/tcp.h>
-#endif /* TEST_FRAME (not defined) */
-
 #include <linux/socket.h> /* for sa_family_t */
 #include <net/sock.h>
 
@@ -367,7 +364,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
        struct sctp_transport *tp = packet->transport;
        struct sctp_association *asoc = tp->asoc;
        struct sctphdr *sh;
-       __be32 crc32 = __constant_cpu_to_be32(0);
        struct sk_buff *nskb;
        struct sctp_chunk *chunk, *tmp;
        struct sock *sk;
@@ -531,17 +527,16 @@ int sctp_packet_transmit(struct sctp_packet *packet)
         * Note: Adler-32 is no longer applicable, as has been replaced
         * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
         */
-       if (!(dst->dev->features & NETIF_F_NO_CSUM)) {
-               crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
-               crc32 = sctp_end_cksum(crc32);
+       if (!sctp_checksum_disable && !(dst->dev->features & NETIF_F_NO_CSUM)) {
+               __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
+
+               /* 3) Put the resultant value into the checksum field in the
+                *    common header, and leave the rest of the bits unchanged.
+                */
+               sh->checksum = sctp_end_cksum(crc32);
        } else
                nskb->ip_summed = CHECKSUM_UNNECESSARY;
 
-       /* 3) Put the resultant value into the checksum field in the
-        *    common header, and leave the rest of the bits unchanged.
-        */
-       sh->checksum = crc32;
-
        /* IP layer ECN support
         * From RFC 2481
         *  "The ECN-Capable Transport (ECT) bit would be set by the