sctp: add feature bit for SCTP offload in hardware

[safe/jmp/linux-2.6] / net / sctp / output.c

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 0dc4a7d..f0c91df 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>
 
@@ -324,14 +321,16 @@ append:
        switch (chunk->chunk_hdr->type) {
            case SCTP_CID_DATA:
                retval = sctp_packet_append_data(packet, chunk);
+               if (SCTP_XMIT_OK != retval)
+                       goto finish;
                /* Disallow SACK bundling after DATA. */
                packet->has_sack = 1;
                /* Disallow AUTH bundling after DATA */
                packet->has_auth = 1;
                /* Let it be knows that packet has DATA in it */
                packet->has_data = 1;
-               if (SCTP_XMIT_OK != retval)
-                       goto finish;
+               /* timestamp the chunk for rtx purposes */
+               chunk->sent_at = jiffies;
                break;
            case SCTP_CID_COOKIE_ECHO:
                packet->has_cookie_echo = 1;
@@ -365,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;
@@ -414,6 +412,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
 
        /* Build the SCTP header.  */
        sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr));
+       skb_reset_transport_header(nskb);
        sh->source = htons(packet->source_port);
        sh->dest   = htons(packet->destination_port);
 
@@ -470,7 +469,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                        } else
                                chunk->resent = 1;
 
-                       chunk->sent_at = jiffies;
                        has_data = 1;
                }
 
@@ -530,15 +528,25 @@ 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 | NETIF_F_SCTP_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 = crc32;
+               /* 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 {
+               if (dst->dev->features & NETIF_F_SCTP_CSUM) {
+                       /* no need to seed psuedo checksum for SCTP */
+                       nskb->ip_summed = CHECKSUM_PARTIAL;
+                       nskb->csum_start = (skb_transport_header(nskb) -
+                                           nskb->head);
+                       nskb->csum_offset = offsetof(struct sctphdr, checksum);
+               } else {
+                       nskb->ip_summed = CHECKSUM_UNNECESSARY;
+               }
+       }
 
        /* IP layer ECN support
         * From RFC 2481
@@ -698,7 +706,7 @@ static sctp_xmit_t sctp_packet_append_data(struct sctp_packet *packet,
         *    When a Fast Retransmit is being performed the sender SHOULD
         *    ignore the value of cwnd and SHOULD NOT delay retransmission.
         */
-       if (chunk->fast_retransmit <= 0)
+       if (chunk->fast_retransmit != SCTP_NEED_FRTX)
                if (transport->flight_size >= transport->cwnd) {
                        retval = SCTP_XMIT_RWND_FULL;
                        goto finish;