patch-2.3.99-pre6 linux/include/linux/net.h

• Lines: 62
• Date: Wed Apr 26 15:29:07 2000
• Orig file: v2.3.99-pre5/linux/include/linux/net.h
• Orig date: Tue Apr 11 15:09:24 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/include/linux/net.h linux/include/linux/net.h
@@ -104,8 +104,6 @@
 			 char *optval, int optlen);
   int	(*getsockopt)	(struct socket *sock, int level, int optname,
 			 char *optval, int *optlen);
-  int	(*fcntl)	(struct socket *sock, unsigned int cmd,
-			 unsigned long arg);	
   int   (*sendmsg)	(struct socket *sock, struct msghdr *m, int total_len, struct scm_cookie *scm);
   int   (*recvmsg)	(struct socket *sock, struct msghdr *m, int total_len, int flags, struct scm_cookie *scm);
   int	(*mmap)		(struct file *file, struct socket *sock, struct vm_area_struct * vma);
@@ -194,8 +192,6 @@
 			 char *optval, int optlen), (sock, level, optname, optval, optlen)) \
 SOCKCALL_WRAP(name, getsockopt, (struct socket *sock, int level, int optname, \
 			 char *optval, int *optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, fcntl, (struct socket *sock, unsigned int cmd, \
-			 unsigned long arg), (sock, cmd, arg)) \
 SOCKCALL_WRAP(name, sendmsg, (struct socket *sock, struct msghdr *m, int len, struct scm_cookie *scm), \
 	      (sock, m, len, scm)) \
 SOCKCALL_WRAP(name, recvmsg, (struct socket *sock, struct msghdr *m, int len, int flags, struct scm_cookie *scm), \
@@ -203,25 +199,24 @@
 SOCKCALL_WRAP(name, mmap, (struct file *file, struct socket *sock, struct vm_area_struct *vma), \
 	      (file, sock, vma)) \
 	      \
-static struct proto_ops name##_ops = {	\
-	fam,				\
-					\
-	__lock_##name##_release,	\
-	__lock_##name##_bind,		\
-	__lock_##name##_connect,	\
-	__lock_##name##_socketpair,	\
-	__lock_##name##_accept,		\
-	__lock_##name##_getname,	\
-	__lock_##name##_poll,		\
-	__lock_##name##_ioctl,		\
-	__lock_##name##_listen,		\
-	__lock_##name##_shutdown,	\
-	__lock_##name##_setsockopt,	\
-	__lock_##name##_getsockopt,	\
-	__lock_##name##_fcntl,		\
-	__lock_##name##_sendmsg,	\
-	__lock_##name##_recvmsg,	\
-	__lock_##name##_mmap,		\
+static struct proto_ops name##_ops = {			\
+	family:		fam,				\
+							\
+	release:	__lock_##name##_release,	\
+	bind:		__lock_##name##_bind,		\
+	connect:	__lock_##name##_connect,	\
+	socketpair:	__lock_##name##_socketpair,	\
+	accept:		__lock_##name##_accept,		\
+	getname:	__lock_##name##_getname,	\
+	poll:		__lock_##name##_poll,		\
+	ioctl:		__lock_##name##_ioctl,		\
+	listen:		__lock_##name##_listen,		\
+	shutdown:	__lock_##name##_shutdown,	\
+	setsockopt:	__lock_##name##_setsockopt,	\
+	getsockopt:	__lock_##name##_getsockopt,	\
+	sendmsg:	__lock_##name##_sendmsg,	\
+	recvmsg:	__lock_##name##_recvmsg,	\
+	mmap:		__lock_##name##_mmap,		\
 };
 #endif