diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-01-29 11:04:35 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-01-31 16:41:16 -0800 |
| commit | 99a7a5b9943ea2d05fb0dee38e4ae2290477ed83 (patch) | |
| tree | 6f47f81313dea6d075f8a90be3a9e71b55c9601d /net/Makefile | |
| parent | 11498715f266a3fb4caabba9dd575636cbcaa8f1 (diff) | |
| download | linux-99a7a5b9943ea2d05fb0dee38e4ae2290477ed83.tar.gz linux-99a7a5b9943ea2d05fb0dee38e4ae2290477ed83.tar.bz2 linux-99a7a5b9943ea2d05fb0dee38e4ae2290477ed83.zip | |
af_unix: Remove CONFIG_UNIX_SCM.
Originally, the code related to garbage collection was all in garbage.c.
Commit f4e65870e5ce ("net: split out functions related to registering
inflight socket files") moved some functions to scm.c for io_uring and
added CONFIG_UNIX_SCM just in case AF_UNIX was built as module.
However, since commit 97154bcf4d1b ("af_unix: Kconfig: make CONFIG_UNIX
bool"), AF_UNIX is no longer built separately. Also, io_uring does not
support SCM_RIGHTS now.
Let's move the functions back to garbage.c
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20240129190435.57228-4-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Makefile b/net/Makefile index b06b5539e7a6..65bb8c72a35e 100644 --- a/net/Makefile +++ b/net/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_TLS) += tls/ obj-$(CONFIG_XFRM) += xfrm/ -obj-$(CONFIG_UNIX_SCM) += unix/ +obj-$(CONFIG_UNIX) += unix/ obj-y += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ |