diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/Kconfig | 4 | ||||
-rw-r--r-- | net/atm/svc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/net/atm/Kconfig b/net/atm/Kconfig index bea2426229b1..21ff276b2d80 100644 --- a/net/atm/Kconfig +++ b/net/atm/Kconfig | |||
@@ -60,7 +60,7 @@ config ATM_BR2684 | |||
60 | tristate "RFC1483/2684 Bridged protocols" | 60 | tristate "RFC1483/2684 Bridged protocols" |
61 | depends on ATM && INET | 61 | depends on ATM && INET |
62 | help | 62 | help |
63 | ATM PVCs can carry ethernet PDUs according to rfc2684 (formerly 1483) | 63 | ATM PVCs can carry ethernet PDUs according to RFC2684 (formerly 1483) |
64 | This device will act like an ethernet from the kernels point of view, | 64 | This device will act like an ethernet from the kernels point of view, |
65 | with the traffic being carried by ATM PVCs (currently 1 PVC/device). | 65 | with the traffic being carried by ATM PVCs (currently 1 PVC/device). |
66 | This is sometimes used over DSL lines. If in doubt, say N. | 66 | This is sometimes used over DSL lines. If in doubt, say N. |
@@ -69,6 +69,6 @@ config ATM_BR2684_IPFILTER | |||
69 | bool "Per-VC IP filter kludge" | 69 | bool "Per-VC IP filter kludge" |
70 | depends on ATM_BR2684 | 70 | depends on ATM_BR2684 |
71 | help | 71 | help |
72 | This is an experimental mechanism for users who need to terminating a | 72 | This is an experimental mechanism for users who need to terminate a |
73 | large number of IP-only vcc's. Do not enable this unless you are sure | 73 | large number of IP-only vcc's. Do not enable this unless you are sure |
74 | you know what you are doing. | 74 | you know what you are doing. |
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; |