summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFan Du <fan.du@windriver.com>2013-10-15 22:01:30 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-04 04:31:04 -0800
commit935be1dc2cafe04f1421e236f75d17878920631b (patch)
tree702f589f7e6f06c913ec3c3486c4987af4b38c3d /net
parentc9446ff691aca0ca902f31f7a9830ac725841759 (diff)
downloadlinux-3.10-935be1dc2cafe04f1421e236f75d17878920631b.tar.gz
linux-3.10-935be1dc2cafe04f1421e236f75d17878920631b.tar.bz2
linux-3.10-935be1dc2cafe04f1421e236f75d17878920631b.zip
sctp: Use software crc32 checksum when xfrm transform will happen.
[ Upstream commit 27127a82561a2a3ed955ce207048e1b066a80a2a ] igb/ixgbe have hardware sctp checksum support, when this feature is enabled and also IPsec is armed to protect sctp traffic, ugly things happened as xfrm_output checks CHECKSUM_PARTIAL to do checksum operation(sum every thing up and pack the 16bits result in the checksum field). The result is fail establishment of sctp communication. Signed-off-by: Fan Du <fan.du@windriver.com> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Vlad Yasevich <vyasevich@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c
index bbef4a7a9b5..a1884399c04 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -547,7 +547,8 @@ int sctp_packet_transmit(struct sctp_packet *packet)
* by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
*/
if (!sctp_checksum_disable) {
- if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {
+ if (!(dst->dev->features & NETIF_F_SCTP_CSUM) ||
+ (dst_xfrm(dst) != NULL)) {
__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
/* 3) Put the resultant value into the checksum field in the