Skip to contentSkip to conversation

: Use modern kernel socket wrappers from linux/net/socket.c:kernel_*()

PATCH New Nicholas A. Bellinger 1 participant 1 message Nov 26, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Use modern kernel socket wrappers from linux/net/socket.c:kernel_*()

Quoted 1 line

From 09898c433f71d32b3072ef14ff3d71ad1700d639 Mon Sep 17 00:00:00 2001

From: Nicholas Bellinger <[email protected]>
Date: Tue, 25 Nov 2008 19:50:16 -0800
Subject: [PATCH] [LIO-Target]: Use modern kernel socket wrappers from linux/net/socket.c:kernel_*()

Removed legacy drivers/lio-core/iscsi_linux_def.h:iscsi_sock_*() macros, and converted v3.0 server side kernel socket code to use kernel sockets API in linux/net/socket.c:kernel_*(). These functions first appeared in kernel.org in v2.6.19.

---
 drivers/lio-core/iscsi_auth_kernel.h  |    5 +--
 drivers/lio-core/iscsi_linux_defs.h   |   23 ---------------
 drivers/lio-core/iscsi_target_login.c |   51 ++++++++++++++++++++-------------
 3 files changed, 33 insertions(+), 46 deletions(-)
drivers/lio-core/iscsi_auth_kernel.h +2 -3
index 96dc7ae..cf789dd 100644
@@ -101,9 +101,8 @@ extern u32 iscsi_handle_authentication (
 	s_addr.sin_addr.s_addr	= htonl(INADDR_LOOPBACK);
 	s_addr.sin_port		= htons(AUTH_PORT);
 
-	if (iscsi_sock_create(&authsock, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-			NULL, NULL) < 0) {
-		TRACE_ERROR("iscsi_sock_create() failed!\n");
+	if (sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &authsock) < 0) {
+		TRACE_ERROR("sock_create() failed!\n");
 		ret = -1;
 		goto out;
 	}
drivers/lio-core/iscsi_linux_defs.h +0 -23
index f609c9d..52b55de 100644
@@ -48,29 +48,6 @@
 	copy_to_user((void *)(dest), (void *)(src), (len))
 
 /*
- * Sockets.
- */
-#define iscsi_sock_create(sock, f, t, p, uc, td) sock_create(f, t, p, sock)
-#define iscsi_sock_connect(sock, s_in, size, td) sock->ops->connect(sock, s_in, size, 0)
-#define iscsi_sock_bind(sock, s_in, size, td) sock->ops->bind(sock, s_in, size)
-#define iscsi_sock_listen(sock, backlog, td) sock->ops->listen(sock, backlog)
-#define iscsi_sock_accept(sock, newsock, td) sock->ops->accept(sock, newsock, 0)
-#define iscsi_sock_sockopt_off(sock, p, o) \
-	{ \
-	int value = 0; \
-	sock->ops->setsockopt(sock, p, o, (char *)&value, sizeof(value)); \
-	}
-#define iscsi_sock_sockopt_on(sock, p, o) \
-	{ \
-	int value = 1; \
-	sock->ops->setsockopt(sock, p, o, (char *)&value, sizeof(value)); \
-	}
-#define iscsi_sock_sockopt_bindtodev(sock, dev) \
-	{ \
-	sock->ops->setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, dev, strlen(dev)); \
-	}
-
-/*
  * Threads.
  */
 #define iscsi_daemon(thread, name, sigs) \
drivers/lio-core/iscsi_target_login.c +31 -20

91 lines not on this page · raw message

Signature · 1 line
1.5.4.1