aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/svc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 19:33:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 19:33:00 -0400
commit38afd6adf6bccd7176e88c07cac104d3639aa30d (patch)
tree2142409984b609e51ef60b6a14318dd4e878718a /net/atm/svc.c
parent8ed1383fb7b6685968588141d5934e0e6715e954 (diff)
parent261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/svc.c')
-rw-r--r--net/atm/svc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 02f5374a51f2..08e46052a3e4 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -118,10 +118,6 @@ static int svc_bind(struct socket *sock,struct sockaddr *sockaddr,
118 goto out; 118 goto out;
119 } 119 }
120 vcc = ATM_SD(sock); 120 vcc = ATM_SD(sock);
121 if (test_bit(ATM_VF_SESSION, &vcc->flags)) {
122 error = -EINVAL;
123 goto out;
124 }
125 addr = (struct sockaddr_atmsvc *) sockaddr; 121 addr = (struct sockaddr_atmsvc *) sockaddr;
126 if (addr->sas_family != AF_ATMSVC) { 122 if (addr->sas_family != AF_ATMSVC) {
127 error = -EAFNOSUPPORT; 123 error = -EAFNOSUPPORT;