Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7d9371b authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/atm/svc.c: checkpatch cleanups 



Convert #include <asm... to #include <linux...
Spacing cleanups
Mostly 80 column wrapped
Move trailing statements to new lines
switch/case cleanups

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ec96e65

net/atm/svc.c

+125 −124
Original line number Diff line number Diff line
@@ -19,14 +19,15 @@ 
#include <linux/atmdev.h>

#include <linux/bitops.h>

#include <net/sock.h>		/* for sock_no_* */

#include <asm/uaccess.h>

#include <linux/uaccess.h>



#include "resources.h"

#include "common.h"		/* common for PVCs and SVCs */

#include "signaling.h"

#include "addr.h"



static int svc_create(struct net *net, struct socket *sock, int protocol, int kern);

static int svc_create(struct net *net, struct socket *sock, int protocol,

		      int kern);



/*

 * Note: since all this is still nicely synchronized with the signaling demon,
@@ -40,7 +41,6 @@ static int svc_shutdown(struct socket *sock,int how) 
	return 0;

}





static void svc_disconnect(struct atm_vcc *vcc)

{

	DEFINE_WAIT(wait);
@@ -53,7 +53,8 @@ static void svc_disconnect(struct atm_vcc *vcc) 
		sigd_enq(vcc, as_close, NULL, NULL, NULL);

		while (!test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) {

			schedule();

			prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);

			prepare_to_wait(sk->sk_sleep, &wait,

					TASK_UNINTERRUPTIBLE);

		}

		finish_wait(sk->sk_sleep, &wait);

	}
@@ -69,7 +70,6 @@ static void svc_disconnect(struct atm_vcc *vcc) 
	/* ... may retry later */

}





static int svc_release(struct socket *sock)

{

	struct sock *sk = sock->sk;
@@ -79,16 +79,17 @@ static int svc_release(struct socket *sock) 
		vcc = ATM_SD(sock);

		pr_debug("%p\n", vcc);

		clear_bit(ATM_VF_READY, &vcc->flags);

		/* VCC pointer is used as a reference, so we must not free it

		   (thereby subjecting it to re-use) before all pending connections

		   are closed */

		/*

		 * VCC pointer is used as a reference,

		 * so we must not free it (thereby subjecting it to re-use)

		 * before all pending connections are closed

		 */

		svc_disconnect(vcc);

		vcc_release(sock);

	}

	return 0;

}





static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,

		    int sockaddr_len)

{
@@ -144,7 +145,6 @@ out: 
	return error;

}





static int svc_connect(struct socket *sock, struct sockaddr *sockaddr,

		       int sockaddr_len, int flags)

{
@@ -213,7 +213,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, 
		while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {

			schedule();

			if (!signal_pending(current)) {

				prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);

				prepare_to_wait(sk->sk_sleep, &wait,

						TASK_INTERRUPTIBLE);

				continue;

			}

			pr_debug("*ABORT*\n");
@@ -231,13 +232,15 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, 
			 */

			sigd_enq(vcc, as_close, NULL, NULL, NULL);

			while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {

				prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);

				prepare_to_wait(sk->sk_sleep, &wait,

						TASK_INTERRUPTIBLE);

				schedule();

			}

			if (!sk->sk_err)

				while (!test_bit(ATM_VF_RELEASED,&vcc->flags)

				    && sigd) {

					prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);

				while (!test_bit(ATM_VF_RELEASED, &vcc->flags) &&

				       sigd) {

					prepare_to_wait(sk->sk_sleep, &wait,

							TASK_INTERRUPTIBLE);

					schedule();

				}

			clear_bit(ATM_VF_REGIS, &vcc->flags);
@@ -270,7 +273,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, 
/*

 * #endif

 */

	if (!(error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci)))

	error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci);

	if (!error)

		sock->state = SS_CONNECTED;

	else

		(void)svc_disconnect(vcc);
@@ -279,7 +283,6 @@ out: 
	return error;

}





static int svc_listen(struct socket *sock, int backlog)

{

	DEFINE_WAIT(wait);
@@ -319,7 +322,6 @@ out: 
	return error;

}





static int svc_accept(struct socket *sock, struct socket *newsock, int flags)

{

	struct sock *sk = sock->sk;
@@ -344,7 +346,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags) 
		prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);

		while (!(skb = skb_dequeue(&sk->sk_receive_queue)) &&

		       sigd) {

			if (test_bit(ATM_VF_RELEASED,&old_vcc->flags)) break;

			if (test_bit(ATM_VF_RELEASED, &old_vcc->flags))

				break;

			if (test_bit(ATM_VF_CLOSE, &old_vcc->flags)) {

				error = -sk->sk_err;

				break;
@@ -360,7 +363,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags) 
				error = -ERESTARTSYS;

				break;

			}

			prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);

			prepare_to_wait(sk->sk_sleep, &wait,

					TASK_INTERRUPTIBLE);

		}

		finish_wait(sk->sk_sleep, &wait);

		if (error)
@@ -376,7 +380,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags) 
		new_vcc->local = msg->local;

		new_vcc->sap = msg->sap;

		error = vcc_connect(newsock, msg->pvc.sap_addr.itf,

				    msg->pvc.sap_addr.vpi, msg->pvc.sap_addr.vci);

				    msg->pvc.sap_addr.vpi,

				    msg->pvc.sap_addr.vci);

		dev_kfree_skb(skb);

		sk->sk_ack_backlog--;

		if (error) {
@@ -387,13 +392,15 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags) 
		}

		/* wait should be short, so we ignore the non-blocking flag */

		set_bit(ATM_VF_WAITING, &new_vcc->flags);

		prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,

				TASK_UNINTERRUPTIBLE);

		sigd_enq(new_vcc, as_accept, old_vcc, NULL, NULL);

		while (test_bit(ATM_VF_WAITING, &new_vcc->flags) && sigd) {

			release_sock(sk);

			schedule();

			lock_sock(sk);

			prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);

			prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,

					TASK_UNINTERRUPTIBLE);

		}

		finish_wait(sk_atm(new_vcc)->sk_sleep, &wait);

		if (!sigd) {
@@ -413,7 +420,6 @@ out: 
	return error;

}





static int svc_getname(struct socket *sock, struct sockaddr *sockaddr,

		       int *sockaddr_len, int peer)

{
@@ -426,7 +432,6 @@ static int svc_getname(struct socket *sock,struct sockaddr *sockaddr, 
	return 0;

}





int svc_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)

{

	struct sock *sk = sk_atm(vcc);
@@ -441,11 +446,11 @@ int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos) 
		prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);

	}

	finish_wait(sk->sk_sleep, &wait);

	if (!sigd) return -EUNATCH;

	if (!sigd)

		return -EUNATCH;

	return -sk->sk_err;

}





static int svc_setsockopt(struct socket *sock, int level, int optname,

			  char __user *optval, unsigned int optlen)

{
@@ -475,17 +480,15 @@ static int svc_setsockopt(struct socket *sock, int level, int optname, 
			error = -EFAULT;

			goto out;

		}

			if (value == 1) {

		if (value == 1)

			set_bit(ATM_VF_SESSION, &vcc->flags);

			} else if (value == 0) {

		else if (value == 0)

			clear_bit(ATM_VF_SESSION, &vcc->flags);

			} else {

		else

			error = -EINVAL;

			}

		break;

	default:

			error = vcc_setsockopt(sock, level, optname,

					       optval, optlen);

		error = vcc_setsockopt(sock, level, optname, optval, optlen);

	}



out:
@@ -493,7 +496,6 @@ out: 
	return error;

}





static int svc_getsockopt(struct socket *sock, int level, int optname,

			  char __user *optval, int __user *optlen)

{
@@ -522,7 +524,6 @@ out: 
	return error;

}





static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,

			int sockaddr_len, int flags)

{
@@ -553,7 +554,6 @@ out: 
	return error;

}





static int svc_dropparty(struct socket *sock, int ep_ref)

{

	DEFINE_WAIT(wait);
@@ -580,7 +580,6 @@ out: 
	return error;

}





static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	int error, ep_ref;
@@ -593,7 +592,8 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			return -EINVAL;

		if (copy_from_user(&sa, (void __user *) arg, sizeof(sa)))

			return -EFAULT;

			error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0);

		error = svc_addparty(sock, (struct sockaddr *)&sa, sizeof(sa),

				     0);

		break;

	case ATM_DROPPARTY:

		if (!test_bit(ATM_VF_SESSION, &vcc->flags))
@@ -610,7 +610,8 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
}



#ifdef CONFIG_COMPAT

static int svc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

static int svc_compat_ioctl(struct socket *sock, unsigned int cmd,

			    unsigned long arg)

{

	/* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf.

	   But actually it takes a struct sockaddr_atmsvc, which doesn't need
@@ -661,13 +662,13 @@ static int svc_create(struct net *net, struct socket *sock, int protocol, 


	sock->ops = &svc_proto_ops;

	error = vcc_create(net, sock, protocol, AF_ATMSVC);

	if (error) return error;

	if (error)

		return error;

	ATM_SD(sock)->local.sas_family = AF_ATMSVC;

	ATM_SD(sock)->remote.sas_family = AF_ATMSVC;

	return 0;

}





static const struct net_proto_family svc_family_ops = {

	.family = PF_ATMSVC,

	.create = svc_create,