diff --git a/[refs] b/[refs] index f5e70ab1f00d..caebd8119ec2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39296ed6699df34fdfbf1b14281c07321a079a3d +refs/heads/master: d84d64dcb3b54c900113f8dcd1240205ae164922 diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h index 119f5a1ed499..93eb708609e7 100644 --- a/trunk/include/net/sctp/sctp.h +++ b/trunk/include/net/sctp/sctp.h @@ -156,7 +156,6 @@ int sctp_primitive_ASCONF(struct sctp_association *, void *arg); __u32 sctp_start_cksum(__u8 *ptr, __u16 count); __u32 sctp_update_cksum(__u8 *ptr, __u16 count, __u32 cksum); __u32 sctp_end_cksum(__u32 cksum); -__u32 sctp_update_copy_cksum(__u8 *, __u8 *, __u16 count, __u32 cksum); /* * sctp/input.c diff --git a/trunk/net/sctp/crc32c.c b/trunk/net/sctp/crc32c.c index 59cf7b06d216..181edabdb8ca 100644 --- a/trunk/net/sctp/crc32c.c +++ b/trunk/net/sctp/crc32c.c @@ -170,6 +170,7 @@ __u32 sctp_update_cksum(__u8 *buffer, __u16 length, __u32 crc32) return crc32; } +#if 0 __u32 sctp_update_copy_cksum(__u8 *to, __u8 *from, __u16 length, __u32 crc32) { __u32 i; @@ -186,6 +187,7 @@ __u32 sctp_update_copy_cksum(__u8 *to, __u8 *from, __u16 length, __u32 crc32) return crc32; } +#endif /* 0 */ __u32 sctp_end_cksum(__u32 crc32) {