diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-17 11:33:33 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-17 11:33:33 +0100 |
| commit | 8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3 (patch) | |
| tree | 92b3d56e173a3bf1b17a9387f5d126a2f3dfb216 /drivers/net/wireguard/device.h | |
| parent | e295886bcbaef6f7e4740d16d12d9f6b72908226 (diff) | |
| parent | afd02352ddd8fd448620078b1a2784b71b74e60a (diff) | |
| download | wireguard-linux-trimmed-8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3.tar.gz wireguard-linux-trimmed-8ff81044f2a3b90c7d3588824b9fdf1372f8e4c3.zip | |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging to bring drm-misc-next-fixes up to the latest state for
the current release cycle.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/wireguard/device.h')
| -rw-r--r-- | drivers/net/wireguard/device.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h index 854bc3d..43c7ceb 100644 --- a/drivers/net/wireguard/device.h +++ b/drivers/net/wireguard/device.h @@ -39,21 +39,18 @@ struct prev_queue { struct wg_device { struct net_device *dev; - struct crypt_queue encrypt_queue, decrypt_queue; + struct crypt_queue encrypt_queue, decrypt_queue, handshake_queue; struct sock __rcu *sock4, *sock6; struct net __rcu *creating_net; struct noise_static_identity static_identity; - struct workqueue_struct *handshake_receive_wq, *handshake_send_wq; - struct workqueue_struct *packet_crypt_wq; - struct sk_buff_head incoming_handshakes; - int incoming_handshake_cpu; - struct multicore_worker __percpu *incoming_handshakes_worker; + struct workqueue_struct *packet_crypt_wq,*handshake_receive_wq, *handshake_send_wq; struct cookie_checker cookie_checker; struct pubkey_hashtable *peer_hashtable; struct index_hashtable *index_hashtable; struct allowedips peer_allowedips; struct mutex device_update_lock, socket_update_lock; struct list_head device_list, peer_list; + atomic_t handshake_queue_len; unsigned int num_peers, device_update_gen; u32 fwmark; u16 incoming_port; |