net: sockets: Remove Posix header file includes

Do not include Posix header files inside network stack as we should
not depend on Posix symbols in net stack.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

subsys/net/lib/sockets/socketpair.c

@@ -6,7 +6,6 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
-#include <zephyr/posix/fcntl.h>
 #include <zephyr/internal/syscall_handler.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/fdtable.h>
@@ -929,19 +928,19 @@ static int spair_ioctl(void *obj, unsigned int request, va_list args)
 	have_local_sem = true;
 
 	switch (request) {
-		case F_GETFL: {
+		case ZVFS_F_GETFL: {
 			if (sock_is_nonblock(spair)) {
-				flags |= O_NONBLOCK;
+				flags |= ZVFS_O_NONBLOCK;
 			}
 
 			res = flags;
 			goto out;
 		}
 
-		case F_SETFL: {
+		case ZVFS_F_SETFL: {
 			flags = va_arg(args, int);
 
-			if (flags & O_NONBLOCK) {
+			if (flags & ZVFS_O_NONBLOCK) {
 				spair->flags |= SPAIR_FLAG_NONBLOCK;
 			} else {
 				spair->flags &= ~SPAIR_FLAG_NONBLOCK;

subsys/net/lib/sockets/sockets_can.c

@@ -6,7 +6,6 @@
  */
 
 #include <stdbool.h>
-#include <zephyr/posix/fcntl.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_can, CONFIG_NET_SOCKETS_LOG_LEVEL);

subsys/net/lib/sockets/sockets_inet.c

@@ -19,7 +19,6 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_types.h>
-#include <zephyr/posix/fcntl.h>
 #include <zephyr/sys/fdtable.h>
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys/iterable_sections.h>
@@ -3045,19 +3044,19 @@ static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
 	switch (request) {
 
 	/* In Zephyr, fcntl() is just an alias of ioctl(). */
-	case F_GETFL:
+	case ZVFS_F_GETFL:
 		if (sock_is_nonblock(obj)) {
-			return O_NONBLOCK;
+			return ZVFS_O_NONBLOCK;
 		}
 
 		return 0;
 
-	case F_SETFL: {
+	case ZVFS_F_SETFL: {
 		int flags;
 
 		flags = va_arg(args, int);
 
-		if (flags & O_NONBLOCK) {
+		if (flags & ZVFS_O_NONBLOCK) {
 			sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK);
 		} else {
 			sock_set_flag(obj, SOCK_NONBLOCK, 0);

subsys/net/lib/sockets/sockets_net_mgmt.c

@@ -5,7 +5,6 @@
  */
 
 #include <stdbool.h>
-#include <zephyr/posix/fcntl.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_mgmt, CONFIG_NET_SOCKETS_LOG_LEVEL);

subsys/net/lib/sockets/sockets_packet.c

@@ -6,7 +6,6 @@
  */
 
 #include <stdbool.h>
-#include <zephyr/posix/fcntl.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_packet, CONFIG_NET_SOCKETS_LOG_LEVEL);

subsys/net/lib/sockets/sockets_tls.c

@@ -6,7 +6,6 @@
  */
 
 #include <stdbool.h>
-#include <zephyr/posix/fcntl.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_tls, CONFIG_NET_SOCKETS_LOG_LEVEL);
@@ -797,13 +796,13 @@ static int wait_for_reason(int sock, int timeout, int reason)
 
 static bool is_blocking(int sock, int flags)
 {
-	int sock_flags = zsock_fcntl(sock, F_GETFL, 0);
+	int sock_flags = zsock_fcntl(sock, ZVFS_F_GETFL, 0);
 
 	if (sock_flags == -1) {
 		return false;
 	}
 
-	return !((flags & ZSOCK_MSG_DONTWAIT) || (sock_flags & O_NONBLOCK));
+	return !((flags & ZSOCK_MSG_DONTWAIT) || (sock_flags & ZVFS_O_NONBLOCK));
 }
 
 static int timeout_to_ms(k_timeout_t *timeout)
@@ -2362,15 +2361,15 @@ int ztls_connect_ctx(struct tls_context *ctx, const struct net_sockaddr *addr,
 	int sock_flags;
 	bool is_non_block;
 
-	sock_flags = zsock_fcntl(ctx->sock, F_GETFL, 0);
+	sock_flags = zsock_fcntl(ctx->sock, ZVFS_F_GETFL, 0);
 	if (sock_flags < 0) {
 		return -EIO;
 	}
 
-	is_non_block = sock_flags & O_NONBLOCK;
+	is_non_block = sock_flags & ZVFS_O_NONBLOCK;
 	if (is_non_block) {
-		(void)zsock_fcntl(ctx->sock, F_SETFL,
-				  sock_flags & ~O_NONBLOCK);
+		(void)zsock_fcntl(ctx->sock, ZVFS_F_SETFL,
+				  sock_flags & ~ZVFS_O_NONBLOCK);
 	}
 
 	ret = zsock_connect(ctx->sock, addr, addrlen);
@@ -2379,7 +2378,7 @@ int ztls_connect_ctx(struct tls_context *ctx, const struct net_sockaddr *addr,
 	}
 
 	if (is_non_block) {
-		(void)zsock_fcntl(ctx->sock, F_SETFL, sock_flags);
+		(void)zsock_fcntl(ctx->sock, ZVFS_F_SETFL, sock_flags);
 	}
 
 #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS)
@@ -3919,8 +3918,8 @@ static int tls_sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
 
 	switch (request) {
 	/* fcntl() commands */
-	case F_GETFL:
-	case F_SETFL: {
+	case ZVFS_F_GETFL:
+	case ZVFS_F_SETFL: {
 		const struct fd_op_vtable *vtable;
 		struct k_mutex *lock;
 		void *fd_obj;

tests/drivers/wifi/nrf_wifi/prj.conf

@@ -53,12 +53,10 @@ CONFIG_REBOOT=y
 CONFIG_LOG=y
 CONFIG_PRINTK=y
 CONFIG_SHELL=y
-CONFIG_SHELL_GETOPT=y
 CONFIG_DEVICE_SHELL=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_DATE_SHELL=y
 CONFIG_NET_CONFIG_AUTO_INIT=n
-CONFIG_POSIX_API=y
 
 # printing of scan results puts pressure on queues in new locking
 # design in net_mgmt. So, use a higher timeout for a crowded