vserver 2.0 rc7

[linux-2.6.git] / net / rose / af_rose.c

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index e02d7eb..7eb6a5b 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -126,28 +126,6 @@ int rosecmpm(rose_address *addr1, rose_address *addr2, unsigned short mask)
        return 0;
 }
 
-static struct sock *rose_alloc_sock(void)
-{
-       rose_cb *rose;
-       struct sock *sk = sk_alloc(PF_ROSE, GFP_ATOMIC, 1, NULL);
-
-       if (!sk)
-               goto out;
-
-       rose = sk->sk_protinfo = kmalloc(sizeof(*rose), GFP_ATOMIC);
-       if (!rose)
-               goto frees;
-
-       memset(rose, 0x00, sizeof(*rose));
-       rose->sk = sk;
-out:
-       return sk;
-frees:
-       sk_free(sk);
-       sk = NULL;
-       goto out;
-}
-
 /*
  *     Socket removal during an interrupt is now safe.
  */
@@ -169,7 +147,7 @@ void rose_kill_by_neigh(struct rose_neigh *neigh)
 
        spin_lock_bh(&rose_list_lock);
        sk_for_each(s, node, &rose_list) {
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
 
                if (rose->neighbour == neigh) {
                        rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0);
@@ -190,7 +168,7 @@ static void rose_kill_by_device(struct net_device *dev)
 
        spin_lock_bh(&rose_list_lock);
        sk_for_each(s, node, &rose_list) {
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
 
                if (rose->device == dev) {
                        rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0);
@@ -247,7 +225,7 @@ static struct sock *rose_find_listener(rose_address *addr, ax25_address *call)
 
        spin_lock_bh(&rose_list_lock);
        sk_for_each(s, node, &rose_list) {
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
 
                if (!rosecmp(&rose->source_addr, addr) &&
                    !ax25cmp(&rose->source_call, call) &&
@@ -256,7 +234,7 @@ static struct sock *rose_find_listener(rose_address *addr, ax25_address *call)
        }
 
        sk_for_each(s, node, &rose_list) {
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
 
                if (!rosecmp(&rose->source_addr, addr) &&
                    !ax25cmp(&rose->source_call, &null_ax25_address) &&
@@ -279,7 +257,7 @@ struct sock *rose_find_socket(unsigned int lci, struct rose_neigh *neigh)
 
        spin_lock_bh(&rose_list_lock);
        sk_for_each(s, node, &rose_list) {
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
 
                if (rose->lci == lci && rose->neighbour == neigh)
                        goto found;
@@ -372,7 +350,7 @@ static int rose_setsockopt(struct socket *sock, int level, int optname,
        char __user *optval, int optlen)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        int opt;
 
        if (level != SOL_ROSE)
@@ -432,7 +410,7 @@ static int rose_getsockopt(struct socket *sock, int level, int optname,
        char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        int val = 0;
        int len;
 
@@ -491,7 +469,7 @@ static int rose_listen(struct socket *sock, int backlog)
        struct sock *sk = sock->sk;
 
        if (sk->sk_state != TCP_LISTEN) {
-               rose_cb *rose = rose_sk(sk);
+               struct rose_sock *rose = rose_sk(sk);
 
                rose->dest_ndigis = 0;
                memset(&rose->dest_addr, 0, ROSE_ADDR_LEN);
@@ -505,21 +483,26 @@ static int rose_listen(struct socket *sock, int backlog)
        return -EOPNOTSUPP;
 }
 
+static struct proto rose_proto = {
+       .name     = "ROSE",
+       .owner    = THIS_MODULE,
+       .obj_size = sizeof(struct rose_sock),
+};
+
 static int rose_create(struct socket *sock, int protocol)
 {
        struct sock *sk;
-       rose_cb *rose;
+       struct rose_sock *rose;
 
        if (sock->type != SOCK_SEQPACKET || protocol != 0)
                return -ESOCKTNOSUPPORT;
 
-       if ((sk = rose_alloc_sock()) == NULL)
+       if ((sk = sk_alloc(PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL)
                return -ENOMEM;
 
        rose = rose_sk(sk);
 
        sock_init_data(sock, sk);
-       sk_set_owner(sk, THIS_MODULE);
 
        skb_queue_head_init(&rose->ack_queue);
 #ifdef M_BIT
@@ -547,18 +530,17 @@ static int rose_create(struct socket *sock, int protocol)
 static struct sock *rose_make_new(struct sock *osk)
 {
        struct sock *sk;
-       rose_cb *rose, *orose;
+       struct rose_sock *rose, *orose;
 
        if (osk->sk_type != SOCK_SEQPACKET)
                return NULL;
 
-       if ((sk = rose_alloc_sock()) == NULL)
+       if ((sk = sk_alloc(PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL)
                return NULL;
 
        rose = rose_sk(sk);
 
        sock_init_data(NULL, sk);
-       sk_set_owner(sk, THIS_MODULE);
 
        skb_queue_head_init(&rose->ack_queue);
 #ifdef M_BIT
@@ -572,10 +554,14 @@ static struct sock *rose_make_new(struct sock *osk)
        sk->sk_protocol = osk->sk_protocol;
        sk->sk_rcvbuf   = osk->sk_rcvbuf;
        sk->sk_sndbuf   = osk->sk_sndbuf;
-       sk->sk_debug    = osk->sk_debug;
        sk->sk_state    = TCP_ESTABLISHED;
        sk->sk_sleep    = osk->sk_sleep;
-       sk->sk_zapped   = osk->sk_zapped;
+
+       if (sock_flag(osk, SOCK_ZAPPED))
+               sock_set_flag(sk, SOCK_ZAPPED);
+
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
 
        init_timer(&rose->timer);
        init_timer(&rose->idletimer);
@@ -596,7 +582,7 @@ static struct sock *rose_make_new(struct sock *osk)
 static int rose_release(struct socket *sock)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose;
+       struct rose_sock *rose;
 
        if (sk == NULL) return 0;
 
@@ -642,13 +628,13 @@ static int rose_release(struct socket *sock)
 static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;
        struct net_device *dev;
        ax25_address *user, *source;
        int n;
 
-       if (!sk->sk_zapped)
+       if (!sock_flag(sk, SOCK_ZAPPED))
                return -EINVAL;
 
        if (addr_len != sizeof(struct sockaddr_rose) && addr_len != sizeof(struct full_sockaddr_rose))
@@ -693,7 +679,7 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
        rose_insert_socket(sk);
 
-       sk->sk_zapped = 0;
+       sock_reset_flag(sk, SOCK_ZAPPED);
        SOCK_DEBUG(sk, "ROSE: socket is bound\n");
        return 0;
 }
@@ -701,7 +687,7 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;
        unsigned char cause, diagnostic;
        ax25_address *user;
@@ -749,8 +735,8 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
        if (!rose->lci)
                return -ENETUNREACH;
 
-       if (sk->sk_zapped) {    /* Must bind first - autobinding in this may or may not work */
-               sk->sk_zapped = 0;
+       if (sock_flag(sk, SOCK_ZAPPED)) {       /* Must bind first - autobinding in this may or may not work */
+               sock_reset_flag(sk, SOCK_ZAPPED);
 
                if ((dev = rose_dev_first()) == NULL)
                        return -ENETUNREACH;
@@ -902,7 +888,7 @@ static int rose_getname(struct socket *sock, struct sockaddr *uaddr,
 {
        struct full_sockaddr_rose *srose = (struct full_sockaddr_rose *)uaddr;
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        int n;
 
        if (peer != 0) {
@@ -931,7 +917,7 @@ int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct ros
 {
        struct sock *sk;
        struct sock *make;
-       rose_cb *make_rose;
+       struct rose_sock *make_rose;
        struct rose_facilities_struct facilities;
        int n, len;
 
@@ -954,7 +940,7 @@ int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct ros
        /*
         * We can't accept the Call Request.
         */
-       if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog ||
+       if (sk == NULL || sk_acceptq_is_full(sk) ||
            (make = rose_make_new(sk)) == NULL) {
                rose_transmit_clear_request(neigh, lci, ROSE_NETWORK_CONGESTION, 120);
                return 0;
@@ -1012,7 +998,7 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *msg, size_t len)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        struct sockaddr_rose *usrose = (struct sockaddr_rose *)msg->msg_name;
        int err;
        struct full_sockaddr_rose srose;
@@ -1023,7 +1009,7 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
        if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))
                return -EINVAL;
 
-       if (sk->sk_zapped)
+       if (sock_flag(sk, SOCK_ZAPPED))
                return -EADDRNOTAVAIL;
 
        if (sk->sk_shutdown & SEND_SHUTDOWN) {
@@ -1182,7 +1168,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *msg, size_t size, int flags)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        struct sockaddr_rose *srose = (struct sockaddr_rose *)msg->msg_name;
        size_t copied;
        unsigned char *asmptr;
@@ -1247,7 +1233,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
 static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
        struct sock *sk = sock->sk;
-       rose_cb *rose = rose_sk(sk);
+       struct rose_sock *rose = rose_sk(sk);
        void __user *argp = (void __user *)arg;
 
        switch (cmd) {
@@ -1382,7 +1368,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
 
        else {
                struct sock *s = v;
-               rose_cb *rose = rose_sk(s);
+               struct rose_sock *rose = rose_sk(s);
                const char *devname, *callsign;
                const struct net_device *dev = rose->device;
 
@@ -1485,6 +1471,10 @@ static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux. Version 0.62
 static int __init rose_proto_init(void)
 {
        int i;
+       int rc = proto_register(&rose_proto, 0);
+
+       if (rc != 0)
+               goto out;
 
        rose_callsign = null_ax25_address;
 
@@ -1537,14 +1527,15 @@ static int __init rose_proto_init(void)
        proc_net_fops_create("rose_neigh", S_IRUGO, &rose_neigh_fops);
        proc_net_fops_create("rose_nodes", S_IRUGO, &rose_nodes_fops);
        proc_net_fops_create("rose_routes", S_IRUGO, &rose_routes_fops);
-
-       return 0;
+out:
+       return rc;
 fail:
        while (--i >= 0) {
                unregister_netdev(dev_rose[i]);
                free_netdev(dev_rose[i]);
        }
        kfree(dev_rose);
+       proto_unregister(&rose_proto);
        return -ENOMEM;
 }
 module_init(rose_proto_init);
@@ -1592,6 +1583,7 @@ static void __exit rose_exit(void)
        }
 
        kfree(dev_rose);
+       proto_unregister(&rose_proto);
 }
 
 module_exit(rose_exit);