diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-22 16:45:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-22 16:45:34 -0700 |
| commit | 255a88e7989ff52c975e8b80de9d746cb107c58e (patch) | |
| tree | 58138d2ffdb6a58ffa8bce66a6ae0f7283827883 /drivers/net/wireguard/noise.c | |
| parent | 58de2b5dc6e1acc0dfe15dfc5fb863c3aec47566 (diff) | |
| parent | a00d10c8fade0f66f0020160cdac7574a9bc49c0 (diff) | |
| download | wireguard-linux-trimmed-255a88e7989ff52c975e8b80de9d746cb107c58e.tar.gz wireguard-linux-trimmed-255a88e7989ff52c975e8b80de9d746cb107c58e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Two minor conflicts:
1) net/ipv4/route.c, adding a new local variable while
moving another local variable and removing it's
initial assignment.
2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
One pretty prints the port mode differently, whilst another
changes the driver to try and obtain the port mode from
the port node rather than the switch node.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireguard/noise.c')
| -rw-r--r-- | drivers/net/wireguard/noise.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c index 3dd3b76..c0cfd9b 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -87,15 +87,12 @@ static void handshake_zero(struct noise_handshake *handshake) void wg_noise_handshake_clear(struct noise_handshake *handshake) { + down_write(&handshake->lock); wg_index_hashtable_remove( handshake->entry.peer->device->index_hashtable, &handshake->entry); - down_write(&handshake->lock); handshake_zero(handshake); up_write(&handshake->lock); - wg_index_hashtable_remove( - handshake->entry.peer->device->index_hashtable, - &handshake->entry); } static struct noise_keypair *keypair_create(struct wg_peer *peer) |