From 6d681ce332cd0f8755df8b2462237231fc073b96 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 31 Oct 2017 11:19:28 +0100 Subject: timers: guard entire setting in block --- src/timers.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/timers.c') diff --git a/src/timers.c b/src/timers.c index 17610b6..af7a912 100644 --- a/src/timers.c +++ b/src/timers.c @@ -127,10 +127,12 @@ void timers_data_sent(struct wireguard_peer *peer) /* Should be called after an authenticated data packet is received. */ void timers_data_received(struct wireguard_peer *peer) { - if (likely(timers_active(peer)) && !timer_pending(&peer->timer_send_keepalive)) - mod_timer(&peer->timer_send_keepalive, jiffies + KEEPALIVE_TIMEOUT); - else - peer->timer_need_another_keepalive = true; + if (likely(timers_active(peer))) { + if (!timer_pending(&peer->timer_send_keepalive)) + mod_timer(&peer->timer_send_keepalive, jiffies + KEEPALIVE_TIMEOUT); + else + peer->timer_need_another_keepalive = true; + } } /* Should be called after any type of authenticated packet is received -- keepalive or data. */ -- cgit v1.2.3-59-g8ed1b