* [PATCH net 0/1] wireguard patches for 6.2-rc1
@ 2022-12-13 22:52 Jason A. Donenfeld
2022-12-13 22:52 ` [PATCH net 1/1] wireguard: timers: cast enum limits members to int in prints Jason A. Donenfeld
0 siblings, 1 reply; 2+ messages in thread
From: Jason A. Donenfeld @ 2022-12-13 22:52 UTC (permalink / raw)
To: kuba, pablo, davem, netdev; +Cc: Jason A. Donenfeld
Hi Jakub & Folks,
This tiny pull just has a single patch to ready wireguard for gcc 13,
casting some arguments to pr_debug to an (int) explicitly, because gcc
13 changes the type of enums.
Since this is just a fix, I've marked it as 'net', but if you prefer to
do it via 'net-next', that's fine too.
Jason
Jiri Slaby (SUSE) (1):
wireguard: timers: cast enum limits members to int in prints
drivers/net/wireguard/timers.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--
2.39.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH net 1/1] wireguard: timers: cast enum limits members to int in prints
2022-12-13 22:52 [PATCH net 0/1] wireguard patches for 6.2-rc1 Jason A. Donenfeld
@ 2022-12-13 22:52 ` Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2022-12-13 22:52 UTC (permalink / raw)
To: kuba, pablo, davem, netdev; +Cc: Jiri Slaby (SUSE), Jason A . Donenfeld
From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Since gcc13, each member of an enum has the same type as the enum. And
that is inherited from its members. Provided "REKEY_AFTER_MESSAGES =
1ULL << 60", 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'
Cast those particular enum members to int when printing them.
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
Cc: Martin Liska <mliska@suse.cz>
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
drivers/net/wireguard/timers.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireguard/timers.c b/drivers/net/wireguard/timers.c
index d54d32ac9bc4..91f5d6d2d4e2 100644
--- a/drivers/net/wireguard/timers.c
+++ b/drivers/net/wireguard/timers.c
@@ -46,7 +46,7 @@ static void wg_expired_retransmit_handshake(struct timer_list *timer)
if (peer->timer_handshake_attempts > MAX_TIMER_HANDSHAKES) {
pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d attempts, giving up\n",
peer->device->dev->name, peer->internal_id,
- &peer->endpoint.addr, MAX_TIMER_HANDSHAKES + 2);
+ &peer->endpoint.addr, (int)MAX_TIMER_HANDSHAKES + 2);
del_timer(&peer->timer_send_keepalive);
/* We drop all packets without a keypair and don't try again,
@@ -64,7 +64,7 @@ static void wg_expired_retransmit_handshake(struct timer_list *timer)
++peer->timer_handshake_attempts;
pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d seconds, retrying (try %d)\n",
peer->device->dev->name, peer->internal_id,
- &peer->endpoint.addr, REKEY_TIMEOUT,
+ &peer->endpoint.addr, (int)REKEY_TIMEOUT,
peer->timer_handshake_attempts + 1);
/* We clear the endpoint address src address, in case this is
@@ -94,7 +94,7 @@ static void wg_expired_new_handshake(struct timer_list *timer)
pr_debug("%s: Retrying handshake with peer %llu (%pISpfsc) because we stopped hearing back after %d seconds\n",
peer->device->dev->name, peer->internal_id,
- &peer->endpoint.addr, KEEPALIVE_TIMEOUT + REKEY_TIMEOUT);
+ &peer->endpoint.addr, (int)(KEEPALIVE_TIMEOUT + REKEY_TIMEOUT));
/* We clear the endpoint address src address, in case this is the cause
* of trouble.
*/
@@ -126,7 +126,7 @@ static void wg_queued_expired_zero_key_material(struct work_struct *work)
pr_debug("%s: Zeroing out all keys for peer %llu (%pISpfsc), since we haven't received a new one in %d seconds\n",
peer->device->dev->name, peer->internal_id,
- &peer->endpoint.addr, REJECT_AFTER_TIME * 3);
+ &peer->endpoint.addr, (int)REJECT_AFTER_TIME * 3);
wg_noise_handshake_clear(&peer->handshake);
wg_noise_keypairs_clear(&peer->keypairs);
wg_peer_put(peer);
--
2.39.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-13 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-13 22:52 [PATCH net 0/1] wireguard patches for 6.2-rc1 Jason A. Donenfeld
2022-12-13 22:52 ` [PATCH net 1/1] wireguard: timers: cast enum limits members to int in prints Jason A. Donenfeld
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.