| Message ID | 20221212114712.11802-1-jirislaby@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] wireguard (gcc13): move ULLs limits away from enum | expand |
I have this queued up already as: https://git.zx2c4.com/wireguard-linux/commit/?id=3d9d8bba03db21f3276324cdba43c82be5d60729 I liked this variant better. Jason
diff --git a/drivers/net/wireguard/messages.h b/drivers/net/wireguard/messages.h index 208da72673fc..048125bdcd23 100644 --- a/drivers/net/wireguard/messages.h +++ b/drivers/net/wireguard/messages.h @@ -37,9 +37,10 @@ enum counter_values { COUNTER_WINDOW_SIZE = COUNTER_BITS_TOTAL - COUNTER_REDUNDANT_BITS }; +#define REKEY_AFTER_MESSAGES BIT_ULL(60) +#define REJECT_AFTER_MESSAGES (U64_MAX - COUNTER_WINDOW_SIZE - 1) + enum limits { - REKEY_AFTER_MESSAGES = 1ULL << 60, - REJECT_AFTER_MESSAGES = U64_MAX - COUNTER_WINDOW_SIZE - 1, REKEY_TIMEOUT = 5, REKEY_TIMEOUT_JITTER_MAX_JIFFIES = HZ / 3, REKEY_AFTER_TIME = 120,
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two: REKEY_AFTER_MESSAGES = 1ULL << 60 REJECT_AFTER_MESSAGES = U64_MAX - COUNTER_WINDOW_SIZE - 1 the named type is unsigned long. This generates warnings with gcc-13: error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int' Define such high values as macros instead of in the enum. Note that enums are not guaranteed to hold unsigned longs in any way. And use BIT_ULL() for REKEY_AFTER_MESSAGES. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113 Cc: Martin Liska <mliska@suse.cz> Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: wireguard@lists.zx2c4.com Cc: netdev@vger.kernel.org Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> --- Notes: [v2] move the constant out of enum (David) drivers/net/wireguard/messages.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)