summaryrefslogtreecommitdiffstats
path: root/net/ipx/af_ipx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipx/af_ipx.c')
-rw-r--r--net/ipx/af_ipx.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index de3588e41..bf660cf0b 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1743,7 +1743,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname,
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 @@ static int ipx_release(struct socket *sock, struct socket *peer)
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 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
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 net_proto_family ipx_family_ops = {
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,