diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-02-23 02:16:56 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-02-23 02:16:56 +0100 |
| commit | 78a45f762d19b6b3079951f471f8811744f2bd81 (patch) | |
| tree | 50aa578e0037cba51cabdbc435da3ce4e580ad93 | |
| parent | 67efb746c492c25fac4d77aa16b808a8aa26089d (diff) | |
pfinet: Fix shifting left into bit 31
| -rw-r--r-- | pfinet/glue-include/asm/bitops.h | 2 | ||||
| -rw-r--r-- | pfinet/linux-src/include/net/sock.h | 2 | ||||
| -rw-r--r-- | pfinet/linux-src/include/net/tcp.h | 6 | ||||
| -rw-r--r-- | pfinet/linux-src/net/ipv6/ip6_fib.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pfinet/glue-include/asm/bitops.h b/pfinet/glue-include/asm/bitops.h index 8c5a835d..3f42ae90 100644 --- a/pfinet/glue-include/asm/bitops.h +++ b/pfinet/glue-include/asm/bitops.h @@ -7,7 +7,7 @@ #include <stdint.h> #define BITOPS_WORD(nr, addr) (((uint32_t *) (addr))[(nr) / 32]) -#define BITOPS_MASK(nr) (1 << ((nr) & 31)) +#define BITOPS_MASK(nr) (1U << ((nr) & 31)) static __inline__ void set_bit (int nr, void *addr) { BITOPS_WORD (nr, addr) |= BITOPS_MASK (nr); } diff --git a/pfinet/linux-src/include/net/sock.h b/pfinet/linux-src/include/net/sock.h index b149224a..5c4444d1 100644 --- a/pfinet/linux-src/include/net/sock.h +++ b/pfinet/linux-src/include/net/sock.h @@ -203,7 +203,7 @@ struct tcp_sack_block { }; struct tcp_opt { - int tcp_header_len; /* Bytes of tcp header to send */ + unsigned int tcp_header_len; /* Bytes of tcp header to send */ /* * Header prediction flags diff --git a/pfinet/linux-src/include/net/tcp.h b/pfinet/linux-src/include/net/tcp.h index d6797ea5..b95bd20d 100644 --- a/pfinet/linux-src/include/net/tcp.h +++ b/pfinet/linux-src/include/net/tcp.h @@ -835,9 +835,9 @@ static __inline__ void tcp_push_pending_frames(struct sock *sk, struct tcp_opt * /* This tells the input processing path that an ACK should go out * right now. */ -#define tcp_enter_quickack_mode(__tp) ((__tp)->ato |= (1<<31)) -#define tcp_exit_quickack_mode(__tp) ((__tp)->ato &= ~(1<<31)) -#define tcp_in_quickack_mode(__tp) (((__tp)->ato & (1 << 31)) != 0) +#define tcp_enter_quickack_mode(__tp) ((__tp)->ato |= (1U<<31)) +#define tcp_exit_quickack_mode(__tp) ((__tp)->ato &= ~(1U<<31)) +#define tcp_in_quickack_mode(__tp) (((__tp)->ato & (1U << 31)) != 0) /* * List all states of a TCP socket that can be viewed as a "connected" diff --git a/pfinet/linux-src/net/ipv6/ip6_fib.c b/pfinet/linux-src/net/ipv6/ip6_fib.c index 670860b2..78b972ac 100644 --- a/pfinet/linux-src/net/ipv6/ip6_fib.c +++ b/pfinet/linux-src/net/ipv6/ip6_fib.c @@ -153,7 +153,7 @@ static __inline__ int addr_bit_set(void *token, int fn_bit) { __u32 *addr = token; - return htonl(1 << ((~fn_bit)&0x1F)) & addr[fn_bit>>5]; + return htonl(1U << ((~fn_bit)&0x1F)) & addr[fn_bit>>5]; } /* |