summaryrefslogtreecommitdiff
path: root/include/net/xdp_sock.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-07-25 12:29:58 +0300
committerIngo Molnar <mingo@kernel.org>2018-07-25 12:29:58 +0300
commit4765096f4f7829d933354ddffedfad32cf063467 (patch)
treee8ab2bfc2062324911de12d034f5d4f222c480b6 /include/net/xdp_sock.h
parentaf0fffd9300b97d8875aa745bc78e2f6fdb3c1f0 (diff)
parentf3d133ee0a17d5694c6f21873eec9863e11fa423 (diff)
downloadlinux-4765096f4f7829d933354ddffedfad32cf063467.tar.xz
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/xdp_sock.h')
-rw-r--r--include/net/xdp_sock.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 9fe472f2ac95..7161856bcf9c 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -60,6 +60,10 @@ struct xdp_sock {
bool zc;
/* Protects multiple processes in the control path */
struct mutex mutex;
+ /* Mutual exclusion of NAPI TX thread and sendmsg error paths
+ * in the SKB destructor callback.
+ */
+ spinlock_t tx_completion_lock;
u64 rx_dropped;
};