diff options
| author | Frank Werner-Krippendorf <mail@hb9fxq.ch> | 2020-06-23 03:59:44 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-07-07 13:26:42 +0200 |
| commit | 56bdfcf4cec966ecd18f13db1f172e5b6fe5bedb (patch) | |
| tree | a72be6cb215d5c4f0a1bf0d381883dad845f857b | |
| parent | c28a94192e71025bf4eb63f80e2d5be647a53aec (diff) | |
| download | wireguard-linux-trimmed-56bdfcf4cec966ecd18f13db1f172e5b6fe5bedb.tar.gz wireguard-linux-trimmed-56bdfcf4cec966ecd18f13db1f172e5b6fe5bedb.zip | |
wireguard: noise: do not assign initiation time in if condition
commit 3c48e60a5a2b3670a3230f831ed35ca02ac80ff3 upstream.
Fixes an error condition reported by checkpatch.pl which caused by
assigning a variable in an if condition in wg_noise_handshake_consume_
initiation().
Signed-off-by: Frank Werner-Krippendorf <mail@hb9fxq.ch>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | drivers/net/wireguard/noise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c index f14fd06..caabe90 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -650,8 +650,8 @@ wg_noise_handshake_consume_initiation(struct message_handshake_initiation *src, memcpy(handshake->hash, hash, NOISE_HASH_LEN); memcpy(handshake->chaining_key, chaining_key, NOISE_HASH_LEN); handshake->remote_index = src->sender_index; - if ((s64)(handshake->last_initiation_consumption - - (initiation_consumption = ktime_get_coarse_boottime_ns())) < 0) + initiation_consumption = ktime_get_coarse_boottime_ns(); + if ((s64)(handshake->last_initiation_consumption - initiation_consumption) < 0) handshake->last_initiation_consumption = initiation_consumption; handshake->state = HANDSHAKE_CONSUMED_INITIATION; up_write(&handshake->lock); |