| Message ID | 20200609152100.29612-1-mail@hb9fxq.ch |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | Do not assign in if condition wg_noise_handshake_consume_initiation() | expand |
On Tue, Jun 9, 2020 at 9:21 AM Frank Werner-Krippendorf <mail@hb9fxq.ch> wrote: > > 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> Thanks. Queued up in the wireguard-linux.git tree. Jason
diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c index 626433690abb..9524a15a62a6 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -617,8 +617,9 @@ 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; + initiation_consumption = ktime_get_coarse_boottime_ns(); if ((s64)(handshake->last_initiation_consumption - - (initiation_consumption = ktime_get_coarse_boottime_ns())) < 0) + initiation_consumption) < 0) handshake->last_initiation_consumption = initiation_consumption; handshake->state = HANDSHAKE_CONSUMED_INITIATION; up_write(&handshake->lock);
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> --- drivers/net/wireguard/noise.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)