mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 22:18:16 +02:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Frank Werner-Krippendorf <mail@hb9fxq.ch>
|
|
Date: Tue, 23 Jun 2020 03:59:44 -0600
|
|
Subject: [PATCH] wireguard: noise: do not assign initiation time in if
|
|
condition
|
|
|
|
commit 558b353c9c2a717509f291c066c6bd8f5f5e21be 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>
|
|
---
|
|
drivers/net/wireguard/noise.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/noise.c
|
|
+++ b/drivers/net/wireguard/noise.c
|
|
@@ -617,8 +617,8 @@ wg_noise_handshake_consume_initiation(st
|
|
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);
|