patch-2.1.53 linux/net/appletalk/ddp.c

• Lines: 66
• Date: Thu Sep 4 13:25:28 1997
• Orig file: v2.1.52/linux/net/appletalk/ddp.c
• Orig date: Thu Jul 17 10:06:09 1997

diff -u --recursive --new-file v2.1.52/linux/net/appletalk/ddp.c linux/net/appletalk/ddp.c
@@ -956,7 +956,7 @@
 static int atalk_create(struct socket *sock, int protocol)
 {
 	struct sock *sk;
-	sk=sk_alloc(GFP_KERNEL);
+	sk=sk_alloc(AF_APPLETALK, GFP_KERNEL);
 	if(sk==NULL)
 		return(-ENOMEM);
 	switch(sock->type)
@@ -985,15 +985,6 @@
 }
 
 /*
- *	Copy a socket. No work needed.
- */
-
-static int atalk_dup(struct socket *newsock,struct socket *oldsock)
-{
-	return(atalk_create(newsock,SOCK_DGRAM));
-}
-
-/*
  *	Free a socket. No work needed
  */
 
@@ -1147,15 +1138,6 @@
  *	Not relevant
  */
 
-static int atalk_socketpair(struct socket *sock1, struct socket *sock2)
-{
-	return(-EOPNOTSUPP);
-}
-
-/*
- *	Not relevant
- */
-
 static int atalk_accept(struct socket *sock, struct socket *newsock, int flags)
 {
 	if(newsock->sk) {
@@ -1994,7 +1976,9 @@
 		case SIOCGIFCONF:
 		case SIOCADDMULTI:
 		case SIOCDELMULTI:
-
+		case SIOCGIFCOUNT:
+		case SIOGIFINDEX:
+		case SIOGIFNAME:
 			return(dev_ioctl(cmd,(void *) arg));
 
 		case SIOCSIFMETRIC:
@@ -2021,11 +2005,11 @@
 static struct proto_ops atalk_dgram_ops = {
 	AF_APPLETALK,
 
-	atalk_dup,
+	sock_no_dup,
 	atalk_release,
 	atalk_bind,
 	atalk_connect,
-	atalk_socketpair,
+	sock_no_socketpair,
 	atalk_accept,
 	atalk_getname,
 	datagram_poll,