mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-10 14:15:47 -05:00
sctp: remove unnecessary byteshifting, calculate directly in big-endian
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
4e54064e0a
commit
336d3262df
@@ -46,9 +46,14 @@
|
||||
#include <net/sctp/sctp.h>
|
||||
#include <linux/crc32c.h>
|
||||
|
||||
static inline __u32 sctp_start_cksum(__u8 *buffer, __u16 length)
|
||||
static inline __be32 sctp_crc32c(__be32 crc, u8 *buffer, u16 length)
|
||||
{
|
||||
__u32 crc = ~(__u32) 0;
|
||||
return (__force __be32)crc32c((__force u32)crc, buffer, length);
|
||||
}
|
||||
|
||||
static inline __be32 sctp_start_cksum(__u8 *buffer, __u16 length)
|
||||
{
|
||||
__be32 crc = ~cpu_to_be32(0);
|
||||
__u8 zero[sizeof(__u32)] = {0};
|
||||
|
||||
/* Optimize this routine to be SCTP specific, knowing how
|
||||
@@ -56,23 +61,23 @@ static inline __u32 sctp_start_cksum(__u8 *buffer, __u16 length)
|
||||
*/
|
||||
|
||||
/* Calculate CRC up to the checksum. */
|
||||
crc = crc32c(crc, buffer, sizeof(struct sctphdr) - sizeof(__u32));
|
||||
crc = sctp_crc32c(crc, buffer, sizeof(struct sctphdr) - sizeof(__u32));
|
||||
|
||||
/* Skip checksum field of the header. */
|
||||
crc = crc32c(crc, zero, sizeof(__u32));
|
||||
crc = sctp_crc32c(crc, zero, sizeof(__u32));
|
||||
|
||||
/* Calculate the rest of the CRC. */
|
||||
crc = crc32c(crc, &buffer[sizeof(struct sctphdr)],
|
||||
crc = sctp_crc32c(crc, &buffer[sizeof(struct sctphdr)],
|
||||
length - sizeof(struct sctphdr));
|
||||
return crc;
|
||||
}
|
||||
|
||||
static inline __u32 sctp_update_cksum(__u8 *buffer, __u16 length, __u32 crc32)
|
||||
static inline __be32 sctp_update_cksum(__u8 *buffer, __u16 length, __be32 crc32)
|
||||
{
|
||||
return crc32c(crc32, buffer, length);
|
||||
return sctp_crc32c(crc32, buffer, length);
|
||||
}
|
||||
|
||||
static inline __u32 sctp_end_cksum(__u32 crc32)
|
||||
static inline __be32 sctp_end_cksum(__be32 crc32)
|
||||
{
|
||||
return ntohl(~crc32);
|
||||
return ~crc32;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user