aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/atm/common.c')
-rw-r--r--net/atm/common.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index a2878e92c3ab..282d761454ba 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -109,11 +109,11 @@ static inline int vcc_writable(struct sock *sk)
109 struct atm_vcc *vcc = atm_sk(sk); 109 struct atm_vcc *vcc = atm_sk(sk);
110 110
111 return (vcc->qos.txtp.max_sdu + 111 return (vcc->qos.txtp.max_sdu +
112 atomic_read(&sk->sk_wmem_alloc)) <= sk->sk_sndbuf; 112 atomic_read(&sk->sk_wmem_alloc)) <= sk->sk_sndbuf;
113} 113}
114 114
115static void vcc_write_space(struct sock *sk) 115static void vcc_write_space(struct sock *sk)
116{ 116{
117 read_lock(&sk->sk_callback_lock); 117 read_lock(&sk->sk_callback_lock);
118 118
119 if (vcc_writable(sk)) { 119 if (vcc_writable(sk)) {
@@ -131,7 +131,7 @@ static struct proto vcc_proto = {
131 .owner = THIS_MODULE, 131 .owner = THIS_MODULE,
132 .obj_size = sizeof(struct atm_vcc), 132 .obj_size = sizeof(struct atm_vcc),
133}; 133};
134 134
135int vcc_create(struct socket *sock, int protocol, int family) 135int vcc_create(struct socket *sock, int protocol, int family)
136{ 136{
137 struct sock *sk; 137 struct sock *sk;
@@ -359,7 +359,7 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,
359 return error; 359 return error;
360 vcc->dev = dev; 360 vcc->dev = dev;
361 write_lock_irq(&vcc_sklist_lock); 361 write_lock_irq(&vcc_sklist_lock);
362 if (test_bit(ATM_DF_REMOVED, &dev->flags) || 362 if (test_bit(ATM_DF_REMOVED, &dev->flags) ||
363 (error = find_ci(vcc, &vpi, &vci))) { 363 (error = find_ci(vcc, &vpi, &vci))) {
364 write_unlock_irq(&vcc_sklist_lock); 364 write_unlock_irq(&vcc_sklist_lock);
365 goto fail_module_put; 365 goto fail_module_put;
@@ -494,20 +494,20 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
494 if (!skb) 494 if (!skb)
495 return error; 495 return error;
496 496
497 copied = skb->len; 497 copied = skb->len;
498 if (copied > size) { 498 if (copied > size) {
499 copied = size; 499 copied = size;
500 msg->msg_flags |= MSG_TRUNC; 500 msg->msg_flags |= MSG_TRUNC;
501 } 501 }
502 502
503 error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); 503 error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
504 if (error) 504 if (error)
505 return error; 505 return error;
506 sock_recv_timestamp(msg, sk, skb); 506 sock_recv_timestamp(msg, sk, skb);
507 DPRINTK("RcvM %d -= %d\n", atomic_read(&sk->rmem_alloc), skb->truesize); 507 DPRINTK("RcvM %d -= %d\n", atomic_read(&sk->rmem_alloc), skb->truesize);
508 atm_return(vcc, skb->truesize); 508 atm_return(vcc, skb->truesize);
509 skb_free_datagram(sk, skb); 509 skb_free_datagram(sk, skb);
510 return copied; 510 return copied;
511} 511}
512 512
513 513
@@ -675,7 +675,7 @@ static int check_qos(struct atm_qos *qos)
675 int error; 675 int error;
676 676
677 if (!qos->txtp.traffic_class && !qos->rxtp.traffic_class) 677 if (!qos->txtp.traffic_class && !qos->rxtp.traffic_class)
678 return -EINVAL; 678 return -EINVAL;
679 if (qos->txtp.traffic_class != qos->rxtp.traffic_class && 679 if (qos->txtp.traffic_class != qos->rxtp.traffic_class &&
680 qos->txtp.traffic_class && qos->rxtp.traffic_class && 680 qos->txtp.traffic_class && qos->rxtp.traffic_class &&
681 qos->txtp.traffic_class != ATM_ANYCLASS && 681 qos->txtp.traffic_class != ATM_ANYCLASS &&
@@ -786,11 +786,11 @@ static int __init atm_init(void)
786 printk(KERN_ERR "atmsvc_init() failed with %d\n", error); 786 printk(KERN_ERR "atmsvc_init() failed with %d\n", error);
787 goto out_atmpvc_exit; 787 goto out_atmpvc_exit;
788 } 788 }
789 if ((error = atm_proc_init()) < 0) { 789 if ((error = atm_proc_init()) < 0) {
790 printk(KERN_ERR "atm_proc_init() failed with %d\n",error); 790 printk(KERN_ERR "atm_proc_init() failed with %d\n",error);
791 goto out_atmsvc_exit; 791 goto out_atmsvc_exit;
792 } 792 }
793 if ((error = atm_sysfs_init()) < 0) { 793 if ((error = atm_sysfs_init()) < 0) {
794 printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error); 794 printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error);
795 goto out_atmproc_exit; 795 goto out_atmproc_exit;
796 } 796 }