net/atm/addr.c: Convert include <asm to include <linux

[safe/jmp/linux-2.6] / net / atm / common.c

diff --git a/net/atm/common.c b/net/atm/common.c
index c865517..17f7e5f 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -2,6 +2,7 @@
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
 
 #include <linux/module.h>
 #include <linux/kmod.h>
@@ -62,15 +63,14 @@ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
        struct sk_buff *skb;
        struct sock *sk = sk_atm(vcc);
 
-       if (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) {
+       if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
                pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
-                       atomic_read(&sk->sk_wmem_alloc), size,
-                       sk->sk_sndbuf);
+                        sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
                return NULL;
        }
-       while (!(skb = alloc_skb(size,GFP_KERNEL))) schedule();
-       pr_debug("AlTx %d += %d\n", atomic_read(&sk->sk_wmem_alloc),
-               skb->truesize);
+       while (!(skb = alloc_skb(size, GFP_KERNEL)))
+               schedule();
+       pr_debug("AlTx %d += %d\n", sk_wmem_alloc_get(sk), skb->truesize);
        atomic_add(skb->truesize, &sk->sk_wmem_alloc);
        return skb;
 }
@@ -92,7 +92,7 @@ static void vcc_sock_destruct(struct sock *sk)
 static void vcc_def_wakeup(struct sock *sk)
 {
        read_lock(&sk->sk_callback_lock);
-       if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+       if (sk_has_sleeper(sk))
                wake_up(sk->sk_sleep);
        read_unlock(&sk->sk_callback_lock);
 }
@@ -110,7 +110,7 @@ static void vcc_write_space(struct sock *sk)
        read_lock(&sk->sk_callback_lock);
 
        if (vcc_writable(sk)) {
-               if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+               if (sk_has_sleeper(sk))
                        wake_up_interruptible(sk->sk_sleep);
 
                sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
@@ -145,7 +145,7 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
        memset(&vcc->local,0,sizeof(struct sockaddr_atmsvc));
        memset(&vcc->remote,0,sizeof(struct sockaddr_atmsvc));
        vcc->qos.txtp.max_sdu = 1 << 16; /* for meta VCs */
-       atomic_set(&sk->sk_wmem_alloc, 0);
+       atomic_set(&sk->sk_wmem_alloc, 1);
        atomic_set(&sk->sk_rmem_alloc, 0);
        vcc->push = NULL;
        vcc->pop = NULL;
@@ -249,8 +249,7 @@ static int adjust_tp(struct atm_trafprm *tp,unsigned char aal)
                        max_sdu = ATM_MAX_AAL34_PDU;
                        break;
                default:
-                       printk(KERN_WARNING "ATM: AAL problems ... "
-                           "(%d)\n",aal);
+                       pr_warning("AAL problems ... (%d)\n", aal);
                        /* fall through */
                case ATM_AAL5:
                        max_sdu = ATM_MAX_AAL5_PDU;
@@ -262,7 +261,7 @@ static int adjust_tp(struct atm_trafprm *tp,unsigned char aal)
 }
 
 
-static int check_ci(struct atm_vcc *vcc, short vpi, int vci)
+static int check_ci(const struct atm_vcc *vcc, short vpi, int vci)
 {
        struct hlist_head *head = &vcc_hash[vci &
                                        (VCC_HTABLE_SIZE - 1)];
@@ -290,7 +289,7 @@ static int check_ci(struct atm_vcc *vcc, short vpi, int vci)
 }
 
 
-static int find_ci(struct atm_vcc *vcc, short *vpi, int *vci)
+static int find_ci(const struct atm_vcc *vcc, short *vpi, int *vci)
 {
        static short p;        /* poor man's per-device cache */
        static int c;
@@ -385,11 +384,17 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,
        if (!error) error = adjust_tp(&vcc->qos.rxtp,vcc->qos.aal);
        if (error)
                goto fail;
-       pr_debug("VCC %d.%d, AAL %d\n",vpi,vci,vcc->qos.aal);
-       pr_debug("  TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,
-           vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu);
-       pr_debug("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,
-           vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu);
+       pr_debug("VCC %d.%d, AAL %d\n", vpi, vci, vcc->qos.aal);
+       pr_debug("  TX: %d, PCR %d..%d, SDU %d\n",
+                vcc->qos.txtp.traffic_class,
+                vcc->qos.txtp.min_pcr,
+                vcc->qos.txtp.max_pcr,
+                vcc->qos.txtp.max_sdu);
+       pr_debug("  RX: %d, PCR %d..%d, SDU %d\n",
+                vcc->qos.rxtp.traffic_class,
+                vcc->qos.rxtp.min_pcr,
+                vcc->qos.rxtp.max_pcr,
+                vcc->qos.rxtp.max_sdu);
 
        if (dev->ops->open) {
                if ((error = dev->ops->open(vcc)))
@@ -413,7 +418,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
        struct atm_vcc *vcc = ATM_SD(sock);
        int error;
 
-       pr_debug("vcc_connect (vpi %d, vci %d)\n",vpi,vci);
+       pr_debug("(vpi %d, vci %d)\n", vpi, vci);
        if (sock->state == SS_CONNECTED)
                return -EISCONN;
        if (sock->state != SS_UNCONNECTED)
@@ -426,14 +431,15 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
        else
                if (test_bit(ATM_VF_PARTIAL,&vcc->flags))
                        return -EINVAL;
-       pr_debug("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; "
-           "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",
-           vcc->qos.txtp.traffic_class,vcc->qos.txtp.min_pcr,
-           vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu,
-           vcc->qos.rxtp.traffic_class,vcc->qos.rxtp.min_pcr,
-           vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu,
-           vcc->qos.aal == ATM_AAL5 ? "" : vcc->qos.aal == ATM_AAL0 ? "" :
-           " ??? code ",vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);
+       pr_debug("(TX: cl %d,bw %d-%d,sdu %d; "
+                "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",
+                vcc->qos.txtp.traffic_class, vcc->qos.txtp.min_pcr,
+                vcc->qos.txtp.max_pcr, vcc->qos.txtp.max_sdu,
+                vcc->qos.rxtp.traffic_class, vcc->qos.rxtp.min_pcr,
+                vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu,
+                vcc->qos.aal == ATM_AAL5 ? "" :
+                vcc->qos.aal == ATM_AAL0 ? "" : " ??? code ",
+                vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);
        if (!test_bit(ATM_VF_HASQOS, &vcc->flags))
                return -EBADFD;
        if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS ||
@@ -496,8 +502,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
        error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
        if (error)
                return error;
-       sock_recv_timestamp(msg, sk, skb);
-       pr_debug("RcvM %d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);
+       sock_recv_ts_and_drops(msg, sk, skb);
+       pr_debug("%d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);
        atm_return(vcc, skb->truesize);
        skb_free_datagram(sk, skb);
        return copied;
@@ -594,7 +600,7 @@ unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
        struct atm_vcc *vcc;
        unsigned int mask;
 
-       poll_wait(file, sk->sk_sleep, wait);
+       sock_poll_wait(file, sk->sk_sleep, wait);
        mask = 0;
 
        vcc = ATM_SD(sock);
@@ -646,7 +652,7 @@ static int atm_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
 }
 
 
-static int check_tp(struct atm_trafprm *tp)
+static int check_tp(const struct atm_trafprm *tp)
 {
        /* @@@ Should be merged with adjust_tp */
        if (!tp->traffic_class || tp->traffic_class == ATM_ANYCLASS) return 0;
@@ -663,7 +669,7 @@ static int check_tp(struct atm_trafprm *tp)
 }
 
 
-static int check_qos(struct atm_qos *qos)
+static int check_qos(const struct atm_qos *qos)
 {
        int error;
 
@@ -679,7 +685,7 @@ static int check_qos(struct atm_qos *qos)
 }
 
 int vcc_setsockopt(struct socket *sock, int level, int optname,
-                  char __user *optval, int optlen)
+                  char __user *optval, unsigned int optlen)
 {
        struct atm_vcc *vcc;
        unsigned long value;
@@ -772,19 +778,19 @@ static int __init atm_init(void)
                goto out;
 
        if ((error = atmpvc_init()) < 0) {
-               printk(KERN_ERR "atmpvc_init() failed with %d\n", error);
+               pr_err("atmpvc_init() failed with %d\n", error);
                goto out_unregister_vcc_proto;
        }
        if ((error = atmsvc_init()) < 0) {
-               printk(KERN_ERR "atmsvc_init() failed with %d\n", error);
+               pr_err("atmsvc_init() failed with %d\n", error);
                goto out_atmpvc_exit;
        }
        if ((error = atm_proc_init()) < 0) {
-               printk(KERN_ERR "atm_proc_init() failed with %d\n",error);
+               pr_err("atm_proc_init() failed with %d\n", error);
                goto out_atmsvc_exit;
        }
        if ((error = atm_sysfs_init()) < 0) {
-               printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error);
+               pr_err("atm_sysfs_init() failed with %d\n", error);
                goto out_atmproc_exit;
        }
 out: