diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-21 13:38:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:38:42 -0700 |
| commit | 033b1142f4bd44a116d1356fe4a0510437ceddf9 (patch) | |
| tree | d2a971a7dc9f3a1af8035e38419c4c4ad8c22632 /net/sctp | |
| parent | f5caadbb3d8fc0b71533e880c684b2230bdb76ac (diff) | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
| download | linux-stable-033b1142f4bd44a116d1356fe4a0510437ceddf9.tar.gz linux-stable-033b1142f4bd44a116d1356fe4a0510437ceddf9.tar.bz2 linux-stable-033b1142f4bd44a116d1356fe4a0510437ceddf9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/output.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index b4f3cf06d8da..08b3cead6503 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -500,23 +500,20 @@ 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 (!sctp_checksum_disable && - !(dst->dev->features & (NETIF_F_NO_CSUM | NETIF_F_SCTP_CSUM))) { - __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); + if (!sctp_checksum_disable) { + if (!(dst->dev->features & 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 = sctp_end_cksum(crc32); - } else { - if (dst->dev->features & NETIF_F_SCTP_CSUM) { + /* 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 { /* no need to seed pseudo 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; } } |