diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:29 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:16 -0500 |
commit | f7d57453d20e27de69ecafd121005e9d13a0f427 (patch) | |
tree | 68fc3b10116cbd4e20411a08fd7f6cc2510c3442 /net/atm/svc.c | |
parent | ed4477b96049fe2908c63f854bf8e37c6df4a635 (diff) |
[NET] ATM: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/svc.c')
-rw-r--r-- | net/atm/svc.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/net/atm/svc.c b/net/atm/svc.c index 3a180cfd7b48..876ec7b47a2f 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c | |||
@@ -89,7 +89,7 @@ static int svc_release(struct socket *sock) | |||
89 | clear_bit(ATM_VF_READY, &vcc->flags); | 89 | clear_bit(ATM_VF_READY, &vcc->flags); |
90 | /* VCC pointer is used as a reference, so we must not free it | 90 | /* VCC pointer is used as a reference, so we must not free it |
91 | (thereby subjecting it to re-use) before all pending connections | 91 | (thereby subjecting it to re-use) before all pending connections |
92 | are closed */ | 92 | are closed */ |
93 | svc_disconnect(vcc); | 93 | svc_disconnect(vcc); |
94 | vcc_release(sock); | 94 | vcc_release(sock); |
95 | } | 95 | } |
@@ -144,7 +144,7 @@ static int svc_bind(struct socket *sock,struct sockaddr *sockaddr, | |||
144 | error = -EUNATCH; | 144 | error = -EUNATCH; |
145 | goto out; | 145 | goto out; |
146 | } | 146 | } |
147 | if (!sk->sk_err) | 147 | if (!sk->sk_err) |
148 | set_bit(ATM_VF_BOUND,&vcc->flags); | 148 | set_bit(ATM_VF_BOUND,&vcc->flags); |
149 | error = -sk->sk_err; | 149 | error = -sk->sk_err; |
150 | out: | 150 | out: |
@@ -229,7 +229,7 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, | |||
229 | * This is tricky: | 229 | * This is tricky: |
230 | * Kernel ---close--> Demon | 230 | * Kernel ---close--> Demon |
231 | * Kernel <--close--- Demon | 231 | * Kernel <--close--- Demon |
232 | * or | 232 | * or |
233 | * Kernel ---close--> Demon | 233 | * Kernel ---close--> Demon |
234 | * Kernel <--error--- Demon | 234 | * Kernel <--error--- Demon |
235 | * or | 235 | * or |
@@ -470,13 +470,13 @@ static int svc_setsockopt(struct socket *sock, int level, int optname, | |||
470 | } | 470 | } |
471 | set_bit(ATM_VF_HASSAP, &vcc->flags); | 471 | set_bit(ATM_VF_HASSAP, &vcc->flags); |
472 | break; | 472 | break; |
473 | case SO_MULTIPOINT: | 473 | case SO_MULTIPOINT: |
474 | if (level != SOL_ATM || optlen != sizeof(int)) { | 474 | if (level != SOL_ATM || optlen != sizeof(int)) { |
475 | error = -EINVAL; | 475 | error = -EINVAL; |
476 | goto out; | 476 | goto out; |
477 | } | 477 | } |
478 | if (get_user(value, (int __user *) optval)) { | 478 | if (get_user(value, (int __user *) optval)) { |
479 | error = -EFAULT; | 479 | error = -EFAULT; |
480 | goto out; | 480 | goto out; |
481 | } | 481 | } |
482 | if (value == 1) { | 482 | if (value == 1) { |
@@ -486,7 +486,7 @@ static int svc_setsockopt(struct socket *sock, int level, int optname, | |||
486 | } else { | 486 | } else { |
487 | error = -EINVAL; | 487 | error = -EINVAL; |
488 | } | 488 | } |
489 | break; | 489 | break; |
490 | default: | 490 | default: |
491 | error = vcc_setsockopt(sock, level, optname, | 491 | error = vcc_setsockopt(sock, level, optname, |
492 | optval, optlen); | 492 | optval, optlen); |
@@ -539,7 +539,7 @@ static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr, | |||
539 | set_bit(ATM_VF_WAITING, &vcc->flags); | 539 | set_bit(ATM_VF_WAITING, &vcc->flags); |
540 | prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); | 540 | prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); |
541 | sigd_enq(vcc, as_addparty, NULL, NULL, | 541 | sigd_enq(vcc, as_addparty, NULL, NULL, |
542 | (struct sockaddr_atmsvc *) sockaddr); | 542 | (struct sockaddr_atmsvc *) sockaddr); |
543 | if (flags & O_NONBLOCK) { | 543 | if (flags & O_NONBLOCK) { |
544 | finish_wait(sk->sk_sleep, &wait); | 544 | finish_wait(sk->sk_sleep, &wait); |
545 | error = -EINPROGRESS; | 545 | error = -EINPROGRESS; |
@@ -587,26 +587,26 @@ out: | |||
587 | 587 | ||
588 | static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | 588 | static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
589 | { | 589 | { |
590 | int error, ep_ref; | 590 | int error, ep_ref; |
591 | struct sockaddr_atmsvc sa; | 591 | struct sockaddr_atmsvc sa; |
592 | struct atm_vcc *vcc = ATM_SD(sock); | 592 | struct atm_vcc *vcc = ATM_SD(sock); |
593 | 593 | ||
594 | switch (cmd) { | 594 | switch (cmd) { |
595 | case ATM_ADDPARTY: | 595 | case ATM_ADDPARTY: |
596 | if (!test_bit(ATM_VF_SESSION, &vcc->flags)) | 596 | if (!test_bit(ATM_VF_SESSION, &vcc->flags)) |
597 | return -EINVAL; | 597 | return -EINVAL; |
598 | if (copy_from_user(&sa, (void __user *) arg, sizeof(sa))) | 598 | if (copy_from_user(&sa, (void __user *) arg, sizeof(sa))) |
599 | return -EFAULT; | 599 | return -EFAULT; |
600 | error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0); | 600 | error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0); |
601 | break; | 601 | break; |
602 | case ATM_DROPPARTY: | 602 | case ATM_DROPPARTY: |
603 | if (!test_bit(ATM_VF_SESSION, &vcc->flags)) | 603 | if (!test_bit(ATM_VF_SESSION, &vcc->flags)) |
604 | return -EINVAL; | 604 | return -EINVAL; |
605 | if (copy_from_user(&ep_ref, (void __user *) arg, sizeof(int))) | 605 | if (copy_from_user(&ep_ref, (void __user *) arg, sizeof(int))) |
606 | return -EFAULT; | 606 | return -EFAULT; |
607 | error = svc_dropparty(sock, ep_ref); | 607 | error = svc_dropparty(sock, ep_ref); |
608 | break; | 608 | break; |
609 | default: | 609 | default: |
610 | error = vcc_ioctl(sock, cmd, arg); | 610 | error = vcc_ioctl(sock, cmd, arg); |
611 | } | 611 | } |
612 | 612 | ||