diff options
| author |   Alexander Duyck <aduyck@mirantis.com> | 2016-03-11 14:05:41 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-13 23:55:13 -0400 |
| commit | 1e94082963747b551b129528714827f76a090e93 (patch) | |
| tree | 543178f26d73ba0a7c9307091200ba6856c9fd60 /arch/arm/include/asm | |
| parent | ipv4: Update parameters for csum_tcpudp_magic to their original types (diff) | |
| download | linux-dev-1e94082963747b551b129528714827f76a090e93.tar.xz linux-dev-1e94082963747b551b129528714827f76a090e93.zip | |
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
This patch updates csum_ipv6_magic so that it correctly recognizes that
protocol is a unsigned 8 bit value.
This will allow us to better understand what limitations may or may not be
present in how we handle the data. For example there are a number of
places that call htonl on the protocol value. This is likely not necessary
and can be replaced with a multiplication by ntohl(1) which will be
converted to a shift by the compiler.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/checksum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h index 42d020b7dfba..524692f4acab 100644 --- a/arch/arm/include/asm/checksum.h +++ b/arch/arm/include/asm/checksum.h @@ -144,8 +144,8 @@ __csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __ __be32 proto, __wsum sum); static inline __sum16 -csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, - unsigned short proto, __wsum sum) +csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, + __u32 len, __u8 proto, __wsum sum) { return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl(len), htonl(proto), sum)); |