mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Make inet_chksum.c compile with -Wconversion
This commit is contained in:
parent
41177cfd1c
commit
94beb4eddf
@ -315,10 +315,10 @@ inet_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
|
|||||||
|
|
||||||
addr = ip4_addr_get_u32(src);
|
addr = ip4_addr_get_u32(src);
|
||||||
acc = (addr & 0xffffUL);
|
acc = (addr & 0xffffUL);
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
addr = ip4_addr_get_u32(dest);
|
addr = ip4_addr_get_u32(dest);
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
/* fold down to 16 bits */
|
/* fold down to 16 bits */
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
@ -349,11 +349,11 @@ ip6_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
|
|||||||
|
|
||||||
for (addr_part = 0; addr_part < 4; addr_part++) {
|
for (addr_part = 0; addr_part < 4; addr_part++) {
|
||||||
addr = src->addr[addr_part];
|
addr = src->addr[addr_part];
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
addr = dest->addr[addr_part];
|
addr = dest->addr[addr_part];
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
}
|
}
|
||||||
/* fold down to 16 bits */
|
/* fold down to 16 bits */
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
@ -461,10 +461,10 @@ inet_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
|
|||||||
|
|
||||||
addr = ip4_addr_get_u32(src);
|
addr = ip4_addr_get_u32(src);
|
||||||
acc = (addr & 0xffffUL);
|
acc = (addr & 0xffffUL);
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
addr = ip4_addr_get_u32(dest);
|
addr = ip4_addr_get_u32(dest);
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
/* fold down to 16 bits */
|
/* fold down to 16 bits */
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
@ -497,11 +497,11 @@ ip6_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
|
|||||||
|
|
||||||
for (addr_part = 0; addr_part < 4; addr_part++) {
|
for (addr_part = 0; addr_part < 4; addr_part++) {
|
||||||
addr = src->addr[addr_part];
|
addr = src->addr[addr_part];
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
addr = dest->addr[addr_part];
|
addr = dest->addr[addr_part];
|
||||||
acc += (addr & 0xffffUL);
|
acc = (u32_t)(acc + (addr & 0xffffUL));
|
||||||
acc += ((addr >> 16) & 0xffffUL);
|
acc = (u32_t)(acc + ((addr >> 16) & 0xffffUL));
|
||||||
}
|
}
|
||||||
/* fold down to 16 bits */
|
/* fold down to 16 bits */
|
||||||
acc = FOLD_U32T(acc);
|
acc = FOLD_U32T(acc);
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
/** Split an u32_t in two u16_ts and add them up */
|
/** Split an u32_t in two u16_ts and add them up */
|
||||||
#ifndef FOLD_U32T
|
#ifndef FOLD_U32T
|
||||||
#define FOLD_U32T(u) (((u) >> 16) + ((u) & 0x0000ffffUL))
|
#define FOLD_U32T(u) ((u32_t)(((u) >> 16) + ((u) & 0x0000ffffUL)))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LWIP_CHECKSUM_ON_COPY
|
#if LWIP_CHECKSUM_ON_COPY
|
||||||
|
Loading…
Reference in New Issue
Block a user