patch-2.1.53 linux/net/ipx/af_ipx.c

Next file: linux/net/netlink.c
Previous file: linux/net/ipv6/tcp_ipv6.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.52/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1743,7 +1743,7 @@
 static int ipx_create(struct socket *sock, int protocol)
 {
 	struct sock *sk;
-	sk=sk_alloc(GFP_KERNEL);
+	sk=sk_alloc(AF_IPX, GFP_KERNEL);
 	if(sk==NULL)
 		return(-ENOMEM);
 	switch(sock->type)
@@ -1776,11 +1776,6 @@
 	return(0);
 }
 
-static int ipx_dup(struct socket *newsock,struct socket *oldsock)
-{
-	return(ipx_create(newsock,SOCK_DGRAM));
-}
-
 static unsigned short ipx_first_free_socketnum(ipx_interface *intrfc)
 {
 	unsigned short	socketNum = intrfc->if_sknum;
@@ -1933,11 +1928,6 @@
 	return 0;
 }
 
-static int ipx_socketpair(struct socket *sock1, struct socket *sock2)
-{
-	return(-EOPNOTSUPP);
-}
-
 static int ipx_accept(struct socket *sock, struct socket *newsock, int flags)
 {
 	if(newsock->sk) {
@@ -2283,11 +2273,11 @@
 static struct proto_ops ipx_dgram_ops = {
 	AF_IPX,
 
-	ipx_dup,
+	sock_no_dup,
 	ipx_release,
 	ipx_bind,
 	ipx_connect,
-	ipx_socketpair,
+	sock_no_socketpair,
 	ipx_accept,
 	ipx_getname,
 	datagram_poll,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov