io_uring/net: move CONFIG_NET guards to Makefile

Instruct Makefile to never try to compile net.c without CONFIG_NET and
kill ifdefs in the file.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/f466400e20c3f536191bfd559b1f3cd2a2ab5a1e.1746788579.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/Makefile b/io_uring/Makefile
index 75e0ca795685621b105bf46a62325f16ca8af041..11a739927a623582f59cf3f7b96da17862fb4a40 100644 (file)
--- a/io_uring/Makefile
+++ b/io_uring/Makefile
@@ -7,7 +7,7 @@ GCOV_PROFILE := y
 endif
 
 obj-$(CONFIG_IO_URING)         += io_uring.o opdef.o kbuf.o rsrc.o notif.o \
-                                       tctx.o filetable.o rw.o net.o poll.o \
+                                       tctx.o filetable.o rw.o poll.o \
                                        eventfd.o uring_cmd.o openclose.o \
                                        sqpoll.o xattr.o nop.o fs.o splice.o \
                                        sync.o msg_ring.o advise.o openclose.o \
@@ -19,4 +19,4 @@ obj-$(CONFIG_IO_WQ)           += io-wq.o
 obj-$(CONFIG_FUTEX)            += futex.o
 obj-$(CONFIG_EPOLL)            += epoll.o
 obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o
-obj-$(CONFIG_NET) += cmd_net.o
+obj-$(CONFIG_NET) += net.o cmd_net.o

diff --git a/io_uring/net.c b/io_uring/net.c
index b3a643675ce87853100d790fd37d0901b7bbb8ba..1fbdb2bbb3f3fb25b35fe3a66cc8129839ccc5e6 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -18,7 +18,6 @@
 #include "rsrc.h"
 #include "zcrx.h"
 
-#if defined(CONFIG_NET)
 struct io_shutdown {
        struct file                     *file;
        int                             how;
@@ -1836,4 +1835,3 @@ void io_netmsg_cache_free(const void *entry)
        io_vec_free(&kmsg->vec);
        kfree(kmsg);
 }
-#endif