diff options
| author | Jakub Kicinski <[email protected]> | 2024-04-25 19:40:48 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-04-25 19:41:37 +0000 |
| commit | 2bd87951de659df3381ce083342aaf5b1ea24689 (patch) | |
| tree | e2635c49fddc29a53b8f537212dc6eb5b2013851 /include/net/af_unix.h | |
| parent | tcp: avoid premature drops in tcp_add_backlog() (diff) | |
| parent | Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-2bd87951de659df3381ce083342aaf5b1ea24689.tar.gz kernel-2bd87951de659df3381ce083342aaf5b1ea24689.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/ti/icssg/icssg_prueth.c
net/mac80211/chan.c
89884459a0b9 ("wifi: mac80211: fix idle calculation with multi-link")
87f5500285fb ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")
https://lore.kernel.org/all/[email protected]/
net/unix/garbage.c
1971d13ffa84 ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().")
4090fa373f0e ("af_unix: Replace garbage collection algorithm.")
drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/ethernet/ti/icssg/icssg_common.c
4dcd0e83ea1d ("net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()")
e2dc7bfd677f ("net: ti: icssg-prueth: Move common functions into a separate file")
No adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 872ff2a50372..b6eedf7650da 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -100,6 +100,9 @@ enum unix_socket_lock_class { U_LOCK_NORMAL, U_LOCK_SECOND, /* for double locking, see unix_state_double_lock(). */ U_LOCK_DIAG, /* used while dumping icons, see sk_diag_dump_icons(). */ + U_LOCK_GC_LISTENER, /* used for listening socket while determining gc + * candidates to close a small race window. + */ }; static inline void unix_state_lock_nested(struct sock *sk, |