diff options
author | Jiri Kosina <jkosina@suse.cz> | 2021-03-30 09:17:09 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2021-03-30 09:17:09 +0200 |
commit | 14db26622dfbf7e4541323ec5685a87b6248e51c (patch) | |
tree | 9c09875378fc2a23dd0b8d4f13bad8b98ab9836d /drivers/net/wireguard/peer.h | |
parent | 85ee8479ba3175c85dcf16e6517a3bc334235fa3 (diff) | |
parent | 67abeb55e1333fb9f8bc2deed91f0370139eb5c7 (diff) | |
download | wireguard-linux-trimmed-14db26622dfbf7e4541323ec5685a87b6248e51c.tar.gz wireguard-linux-trimmed-14db26622dfbf7e4541323ec5685a87b6248e51c.zip |
Merge tag 'platform-drivers-x86-surface-aggregator-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-5.13/surface-system-aggregator-intergration
Pull immutable integration branch from Hans de Goede to have a stable base for
SSAM (Surface System Aggregator Module) HID transport subsystem merge.
=====
Signed tag for the immutable platform-surface-aggregator-registry
branch for merging into other sub-systems.
Note this is based on v5.12-rc2.
=====
Diffstat (limited to 'drivers/net/wireguard/peer.h')
-rw-r--r-- | drivers/net/wireguard/peer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireguard/peer.h b/drivers/net/wireguard/peer.h index 23af409..8d53b68 100644 --- a/drivers/net/wireguard/peer.h +++ b/drivers/net/wireguard/peer.h @@ -36,16 +36,17 @@ struct endpoint { struct wg_peer { struct wg_device *device; - struct crypt_queue tx_queue, rx_queue; + struct prev_queue tx_queue, rx_queue; struct sk_buff_head staged_packet_queue; int serial_work_cpu; + bool is_dead; struct noise_keypairs keypairs; struct endpoint endpoint; struct dst_cache endpoint_cache; rwlock_t endpoint_lock; struct noise_handshake handshake; atomic64_t last_sent_handshake; - struct work_struct transmit_handshake_work, clear_peer_work; + struct work_struct transmit_handshake_work, clear_peer_work, transmit_packet_work; struct cookie latest_cookie; struct hlist_node pubkey_hash; u64 rx_bytes, tx_bytes; @@ -61,9 +62,8 @@ struct wg_peer { struct rcu_head rcu; struct list_head peer_list; struct list_head allowedips_list; - u64 internal_id; struct napi_struct napi; - bool is_dead; + u64 internal_id; }; struct wg_peer *wg_peer_create(struct wg_device *wg, |