diff options
author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 11:06:23 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 11:06:23 +0300 |
commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /include/net/xdp_sock.h | |
parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
download | linux-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.tar.xz |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12
merge due to the swap issue so it looks like a good time.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/net/xdp_sock.h')
-rw-r--r-- | include/net/xdp_sock.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 4f4e93bf814c..cc17bc957548 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -58,10 +58,6 @@ struct xdp_sock { struct xsk_queue *tx ____cacheline_aligned_in_smp; struct list_head tx_list; - /* Mutual exclusion of NAPI TX thread and sendmsg error paths - * in the SKB destructor callback. - */ - spinlock_t tx_completion_lock; /* Protects generic receive. */ spinlock_t rx_lock; |