diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-03-14 16:34:35 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-03-14 16:34:35 +0100 |
| commit | 0c371d94ab10f100090c003a57fa1e720e35402c (patch) | |
| tree | 9c09875378fc2a23dd0b8d4f13bad8b98ab9836d /drivers/net/wireguard/device.h | |
| parent | 1bb13d02e6fff32818ccde759efe88c70afd008e (diff) | |
| parent | 67abeb55e1333fb9f8bc2deed91f0370139eb5c7 (diff) | |
| download | wireguard-linux-trimmed-0c371d94ab10f100090c003a57fa1e720e35402c.tar.gz wireguard-linux-trimmed-0c371d94ab10f100090c003a57fa1e720e35402c.zip | |
Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- More compatible strings for the Ingenic irqchip (introducing the
JZ4760B SoC)
- Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform
- Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip
Kconfig, now relying on the architecture to get it right
- Drop the debugfs_file field from struct irq_domain, now that
debugfs can track things on its own
Diffstat (limited to 'drivers/net/wireguard/device.h')
| -rw-r--r-- | drivers/net/wireguard/device.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h index 4d0144e..854bc3d 100644 --- a/drivers/net/wireguard/device.h +++ b/drivers/net/wireguard/device.h @@ -27,13 +27,14 @@ struct multicore_worker { struct crypt_queue { struct ptr_ring ring; - union { - struct { - struct multicore_worker __percpu *worker; - int last_cpu; - }; - struct work_struct work; - }; + struct multicore_worker __percpu *worker; + int last_cpu; +}; + +struct prev_queue { + struct sk_buff *head, *tail, *peeked; + struct { struct sk_buff *next, *prev; } empty; // Match first 2 members of struct sk_buff. + atomic_t count; }; struct wg_device { |