diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /net/ax25 | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 8e5992747..baa5bb40e 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -828,7 +828,7 @@ int ax25_create(struct socket *sock, int protocol) return -ESOCKTNOSUPPORT; } - if ((sk = sk_alloc(GFP_ATOMIC)) == NULL) + if ((sk = sk_alloc(AF_AX25, GFP_ATOMIC)) == NULL) return -ENOMEM; if ((ax25 = ax25_create_cb()) == NULL) { @@ -854,7 +854,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) struct sock *sk; ax25_cb *ax25; - if ((sk = sk_alloc(GFP_ATOMIC)) == NULL) + if ((sk = sk_alloc(AF_AX25, GFP_ATOMIC)) == NULL) return NULL; if ((ax25 = ax25_create_cb()) == NULL) { @@ -919,16 +919,6 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) return sk; } -static int ax25_dup(struct socket *newsock, struct socket *oldsock) -{ - struct sock *sk = oldsock->sk; - - if (sk == NULL || newsock == NULL) - return -EINVAL; - - return ax25_create(newsock, sk->protocol); -} - static int ax25_release(struct socket *sock, struct socket *peer) { struct sock *sk = sock->sk; @@ -1204,10 +1194,6 @@ static int ax25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le return 0; } -static int ax25_socketpair(struct socket *sock1, struct socket *sock2) -{ - return -EOPNOTSUPP; -} static int ax25_accept(struct socket *sock, struct socket *newsock, int flags) { @@ -1707,11 +1693,11 @@ static struct net_proto_family ax25_family_ops = static struct proto_ops ax25_proto_ops = { AF_AX25, - ax25_dup, + sock_no_dup, ax25_release, ax25_bind, ax25_connect, - ax25_socketpair, + sock_no_socketpair, ax25_accept, ax25_getname, datagram_poll, |