patch-2.4.23 linux-2.4.23/net/atm/common.c
Next file: linux-2.4.23/net/atm/common.h
Previous file: linux-2.4.23/net/atm/clip.c
Back to the patch index
Back to the overall index
- Lines: 1417
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/net/atm/common.c
- Orig date:
2003-08-25 04:44:44.000000000 -0700
diff -urN linux-2.4.22/net/atm/common.c linux-2.4.23/net/atm/common.c
@@ -33,21 +33,61 @@
#include <linux/atmlec.h>
#include "lec.h"
#include "lec_arpc.h"
-struct atm_lane_ops atm_lane_ops;
-#endif
-#ifdef CONFIG_ATM_LANE_MODULE
+struct atm_lane_ops *atm_lane_ops;
+static DECLARE_MUTEX(atm_lane_ops_mutex);
+
+void atm_lane_ops_set(struct atm_lane_ops *hook)
+{
+ down(&atm_lane_ops_mutex);
+ atm_lane_ops = hook;
+ up(&atm_lane_ops_mutex);
+}
+
+int try_atm_lane_ops(void)
+{
+ down(&atm_lane_ops_mutex);
+ if (atm_lane_ops && try_inc_mod_count(atm_lane_ops->owner)) {
+ up(&atm_lane_ops_mutex);
+ return 1;
+ }
+ up(&atm_lane_ops_mutex);
+ return 0;
+}
+
+#if defined(CONFIG_ATM_LANE_MODULE) || defined(CONFIG_ATM_MPOA_MODULE)
EXPORT_SYMBOL(atm_lane_ops);
+EXPORT_SYMBOL(try_atm_lane_ops);
+EXPORT_SYMBOL(atm_lane_ops_set);
+#endif
#endif
#if defined(CONFIG_ATM_MPOA) || defined(CONFIG_ATM_MPOA_MODULE)
#include <linux/atmmpc.h>
#include "mpc.h"
-struct atm_mpoa_ops atm_mpoa_ops;
-#endif
+struct atm_mpoa_ops *atm_mpoa_ops;
+static DECLARE_MUTEX(atm_mpoa_ops_mutex);
+
+void atm_mpoa_ops_set(struct atm_mpoa_ops *hook)
+{
+ down(&atm_mpoa_ops_mutex);
+ atm_mpoa_ops = hook;
+ up(&atm_mpoa_ops_mutex);
+}
+
+int try_atm_mpoa_ops(void)
+{
+ down(&atm_mpoa_ops_mutex);
+ if (atm_mpoa_ops && try_inc_mod_count(atm_mpoa_ops->owner)) {
+ up(&atm_mpoa_ops_mutex);
+ return 1;
+ }
+ up(&atm_mpoa_ops_mutex);
+ return 0;
+}
#ifdef CONFIG_ATM_MPOA_MODULE
EXPORT_SYMBOL(atm_mpoa_ops);
-#ifndef CONFIG_ATM_LANE_MODULE
-EXPORT_SYMBOL(atm_lane_ops);
+EXPORT_SYMBOL(try_atm_mpoa_ops);
+EXPORT_SYMBOL(atm_mpoa_ops_set);
#endif
#endif
@@ -84,21 +124,41 @@
#ifdef CONFIG_ATM_CLIP_MODULE
EXPORT_SYMBOL(atm_clip_ops);
-EXPORT_SYMBOL(atm_clip_ops_mutex);
+EXPORT_SYMBOL(try_atm_clip_ops);
EXPORT_SYMBOL(atm_clip_ops_set);
#endif
#endif
#if defined(CONFIG_PPPOATM) || defined(CONFIG_PPPOATM_MODULE)
-int (*pppoatm_ioctl_hook)(struct atm_vcc *, unsigned int, unsigned long);
-EXPORT_SYMBOL(pppoatm_ioctl_hook);
+static DECLARE_MUTEX(pppoatm_ioctl_mutex);
+
+static int (*pppoatm_ioctl_hook)(struct atm_vcc *, unsigned int, unsigned long);
+
+void pppoatm_ioctl_set(int (*hook)(struct atm_vcc *, unsigned int, unsigned long))
+{
+ down(&pppoatm_ioctl_mutex);
+ pppoatm_ioctl_hook = hook;
+ up(&pppoatm_ioctl_mutex);
+}
+#ifdef CONFIG_PPPOATM_MODULE
+EXPORT_SYMBOL(pppoatm_ioctl_set);
+#endif
#endif
#if defined(CONFIG_ATM_BR2684) || defined(CONFIG_ATM_BR2684_MODULE)
-int (*br2684_ioctl_hook)(struct atm_vcc *, unsigned int, unsigned long);
-#endif
+static DECLARE_MUTEX(br2684_ioctl_mutex);
+
+static int (*br2684_ioctl_hook)(struct atm_vcc *, unsigned int, unsigned long);
+
+void br2684_ioctl_set(int (*hook)(struct atm_vcc *, unsigned int, unsigned long))
+{
+ down(&br2684_ioctl_mutex);
+ br2684_ioctl_hook = hook;
+ up(&br2684_ioctl_mutex);
+}
#ifdef CONFIG_ATM_BR2684_MODULE
-EXPORT_SYMBOL(br2684_ioctl_hook);
+EXPORT_SYMBOL(br2684_ioctl_set);
+#endif
#endif
#include "resources.h" /* atm_find_dev */
@@ -118,6 +178,38 @@
#endif
+struct sock *vcc_sklist;
+rwlock_t vcc_sklist_lock = RW_LOCK_UNLOCKED;
+
+void __vcc_insert_socket(struct sock *sk)
+{
+ sk->next = vcc_sklist;
+ if (sk->next)
+ vcc_sklist->pprev = &sk->next;
+ vcc_sklist = sk;
+ sk->pprev = &vcc_sklist;
+}
+
+void vcc_insert_socket(struct sock *sk)
+{
+ write_lock_irq(&vcc_sklist_lock);
+ __vcc_insert_socket(sk);
+ write_unlock_irq(&vcc_sklist_lock);
+}
+
+void vcc_remove_socket(struct sock *sk)
+{
+ write_lock_irq(&vcc_sklist_lock);
+ if (sk->pprev) {
+ if (sk->next)
+ sk->next->pprev = sk->pprev;
+ *sk->pprev = sk->next;
+ sk->pprev = NULL;
+ }
+ write_unlock_irq(&vcc_sklist_lock);
+}
+
+
static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
{
struct sk_buff *skb;
@@ -134,16 +226,46 @@
}
-int atm_create(struct socket *sock,int protocol,int family)
+EXPORT_SYMBOL(vcc_sklist);
+EXPORT_SYMBOL(vcc_sklist_lock);
+EXPORT_SYMBOL(vcc_insert_socket);
+EXPORT_SYMBOL(vcc_remove_socket);
+
+static void vcc_sock_destruct(struct sock *sk)
{
+ struct atm_vcc *vcc = sk->protinfo.af_atm;
+
+ if (atomic_read(&vcc->sk->rmem_alloc))
+ printk(KERN_DEBUG "vcc_sock_destruct: rmem leakage (%d bytes) detected.\n", atomic_read(&sk->rmem_alloc));
+
+ if (atomic_read(&vcc->sk->wmem_alloc))
+ printk(KERN_DEBUG "vcc_sock_destruct: wmem leakage (%d bytes) detected.\n", atomic_read(&sk->wmem_alloc));
+
+ kfree(sk->protinfo.af_atm);
+}
+
+int vcc_create(struct socket *sock, int protocol, int family)
+{
struct sock *sk;
struct atm_vcc *vcc;
sock->sk = NULL;
- if (sock->type == SOCK_STREAM) return -EINVAL;
- if (!(sk = alloc_atm_vcc_sk(family))) return -ENOMEM;
- vcc = sk->protinfo.af_atm;
- memset(&vcc->flags,0,sizeof(vcc->flags));
+ if (sock->type == SOCK_STREAM)
+ return -EINVAL;
+ sk = sk_alloc(family, GFP_KERNEL, 1);
+ if (!sk)
+ return -ENOMEM;
+ sock_init_data(NULL, sk);
+
+ vcc = sk->protinfo.af_atm = kmalloc(sizeof(*vcc), GFP_KERNEL);
+ if (!vcc) {
+ sk_free(sk);
+ return -ENOMEM;
+ }
+
+ memset(vcc, 0, sizeof(*vcc));
+ vcc->sk = sk;
+
vcc->dev = NULL;
vcc->callback = NULL;
memset(&vcc->local,0,sizeof(struct sockaddr_atmsvc));
@@ -157,23 +279,28 @@
vcc->vpi = vcc->vci = 0; /* no VCI/VPI yet */
vcc->atm_options = vcc->aal_options = 0;
init_waitqueue_head(&vcc->sleep);
- skb_queue_head_init(&vcc->listenq);
sk->sleep = &vcc->sleep;
+ sk->destruct = vcc_sock_destruct;
sock->sk = sk;
return 0;
}
-void atm_release_vcc_sk(struct sock *sk,int free_sk)
+static void vcc_destroy_socket(struct sock *sk)
{
struct atm_vcc *vcc;
struct sk_buff *skb;
vcc = sk->protinfo.af_atm;
- clear_bit(ATM_VF_READY,&vcc->flags);
+ clear_bit(ATM_VF_READY, &vcc->flags);
if (vcc->dev) {
- if (vcc->dev->ops->close) vcc->dev->ops->close(vcc);
- if (vcc->push) vcc->push(vcc,NULL); /* atmarpd has no push */
+ if (vcc->dev->ops->close)
+ vcc->dev->ops->close(vcc);
+ if (vcc->push)
+ vcc->push(vcc, NULL); /* atmarpd has no push */
+
+ vcc_remove_socket(sk); /* no more receive */
+
while ((skb = skb_dequeue(&vcc->sk->receive_queue))) {
atm_return(vcc,skb->truesize);
kfree_skb(skb);
@@ -181,35 +308,36 @@
if (vcc->dev->ops->owner)
__MOD_DEC_USE_COUNT(vcc->dev->ops->owner);
- atm_dev_release(vcc->dev);
- if (atomic_read(&vcc->sk->rmem_alloc))
- printk(KERN_WARNING "atm_release_vcc: strange ... "
- "rmem_alloc == %d after closing\n",
- atomic_read(&vcc->sk->rmem_alloc));
- bind_vcc(vcc,NULL);
+ atm_dev_put(vcc->dev);
}
-
- if (free_sk) free_atm_vcc_sk(sk);
}
-int atm_release(struct socket *sock)
+int vcc_release(struct socket *sock)
{
- if (sock->sk)
- atm_release_vcc_sk(sock->sk,1);
+ struct sock *sk = sock->sk;
+
+ if (sk) {
+ lock_sock(sk);
+ vcc_destroy_socket(sock->sk);
+ release_sock(sk);
+ sock_put(sk);
+ }
+
return 0;
}
-void atm_async_release_vcc(struct atm_vcc *vcc,int reply)
+void vcc_release_async(struct atm_vcc *vcc, int reply)
{
- set_bit(ATM_VF_CLOSE,&vcc->flags);
+ set_bit(ATM_VF_CLOSE, &vcc->flags);
vcc->reply = reply;
+ vcc->sk->err = -reply;
wake_up(&vcc->sleep);
}
-EXPORT_SYMBOL(atm_async_release_vcc);
+EXPORT_SYMBOL(vcc_release_async);
static int adjust_tp(struct atm_trafprm *tp,unsigned char aal)
@@ -238,8 +366,8 @@
}
-static int atm_do_connect_dev(struct atm_vcc *vcc,struct atm_dev *dev,int vpi,
- int vci)
+static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, int vpi,
+ int vci)
{
int error;
@@ -250,7 +378,10 @@
if (vci > 0 && vci < ATM_NOT_RSV_VCI && !capable(CAP_NET_BIND_SERVICE))
return -EPERM;
error = 0;
- bind_vcc(vcc,dev);
+ if (!try_inc_mod_count(dev->ops->owner))
+ return -ENODEV;
+ vcc->dev = dev;
+ vcc_insert_socket(vcc->sk);
switch (vcc->qos.aal) {
case ATM_AAL0:
error = atm_init_aal0(vcc);
@@ -273,53 +404,50 @@
}
if (!error) error = adjust_tp(&vcc->qos.txtp,vcc->qos.aal);
if (!error) error = adjust_tp(&vcc->qos.rxtp,vcc->qos.aal);
- if (error) {
- bind_vcc(vcc,NULL);
- return error;
- }
+ if (error)
+ goto fail;
DPRINTK("VCC %d.%d, AAL %d\n",vpi,vci,vcc->qos.aal);
DPRINTK(" TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,
vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu);
DPRINTK(" RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,
vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu);
- if (!try_inc_mod_count(dev->ops->owner))
- return -ENODEV;
if (dev->ops->open) {
- error = dev->ops->open(vcc,vpi,vci);
- if (error) {
- if (dev->ops->owner)
- __MOD_DEC_USE_COUNT(dev->ops->owner);
- bind_vcc(vcc,NULL);
- return error;
- }
+ if ((error = dev->ops->open(vcc,vpi,vci)))
+ goto fail;
}
return 0;
+
+fail:
+ vcc_remove_socket(vcc->sk);
+ if (dev->ops->owner)
+ __MOD_DEC_USE_COUNT(dev->ops->owner);
+ /* ensure we get dev module ref count correct */
+ vcc->dev = NULL;
+ return error;
+
}
-static int atm_do_connect(struct atm_vcc *vcc,int itf,int vpi,int vci)
+int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
{
struct atm_dev *dev;
- int return_val;
-
- dev = atm_dev_lookup(itf);
- if (!dev)
- return_val = -ENODEV;
- else {
- return_val = atm_do_connect_dev(vcc,dev,vpi,vci);
- if (return_val) atm_dev_release(dev);
- }
-
- return return_val;
-}
+ struct atm_vcc *vcc = ATM_SD(sock);
+ int error;
+ DPRINTK("vcc_connect (vpi %d, vci %d)\n",vpi,vci);
+ if (sock->state == SS_CONNECTED)
+ return -EISCONN;
+ if (sock->state != SS_UNCONNECTED)
+ return -EINVAL;
+ if (!(vpi || vci))
+ return -EINVAL;
-int atm_connect_vcc(struct atm_vcc *vcc,int itf,short vpi,int vci)
-{
if (vpi != ATM_VPI_UNSPEC && vci != ATM_VCI_UNSPEC)
clear_bit(ATM_VF_PARTIAL,&vcc->flags);
- else if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) return -EINVAL;
- DPRINTK("atm_connect (TX: cl %d,bw %d-%d,sdu %d; "
+ else
+ if (test_bit(ATM_VF_PARTIAL,&vcc->flags))
+ return -EINVAL;
+ DPRINTK("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; "
"RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",
vcc->qos.txtp.traffic_class,vcc->qos.txtp.min_pcr,
vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu,
@@ -327,143 +455,142 @@
vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu,
vcc->qos.aal == ATM_AAL5 ? "" : vcc->qos.aal == ATM_AAL0 ? "" :
" ??? code ",vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);
- if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) return -EBADFD;
+ if (!test_bit(ATM_VF_HASQOS, &vcc->flags))
+ return -EBADFD;
if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS ||
vcc->qos.rxtp.traffic_class == ATM_ANYCLASS)
return -EINVAL;
if (itf != ATM_ITF_ANY) {
- int error;
-
- error = atm_do_connect(vcc,itf,vpi,vci);
- if (error) return error;
- }
- else {
- struct atm_dev *dev = NULL;
+ dev = atm_dev_lookup(itf);
+ if (!dev)
+ return -ENODEV;
+ error = __vcc_connect(vcc, dev, vpi, vci);
+ if (error) {
+ atm_dev_put(dev);
+ return error;
+ }
+ } else {
struct list_head *p, *next;
+ dev = NULL;
spin_lock(&atm_dev_lock);
list_for_each_safe(p, next, &atm_devs) {
dev = list_entry(p, struct atm_dev, dev_list);
atm_dev_hold(dev);
spin_unlock(&atm_dev_lock);
- if (!atm_do_connect_dev(vcc,dev,vpi,vci))
+ if (!__vcc_connect(vcc, dev, vpi, vci))
break;
- atm_dev_release(dev);
+ atm_dev_put(dev);
dev = NULL;
spin_lock(&atm_dev_lock);
}
spin_unlock(&atm_dev_lock);
- if (!dev) return -ENODEV;
+ if (!dev)
+ return -ENODEV;
}
if (vpi == ATM_VPI_UNSPEC || vci == ATM_VCI_UNSPEC)
set_bit(ATM_VF_PARTIAL,&vcc->flags);
- return 0;
-}
-
-
-int atm_connect(struct socket *sock,int itf,short vpi,int vci)
-{
- int error;
-
- DPRINTK("atm_connect (vpi %d, vci %d)\n",vpi,vci);
- if (sock->state == SS_CONNECTED) return -EISCONN;
- if (sock->state != SS_UNCONNECTED) return -EINVAL;
- if (!(vpi || vci)) return -EINVAL;
- error = atm_connect_vcc(ATM_SD(sock),itf,vpi,vci);
- if (error) return error;
if (test_bit(ATM_VF_READY,&ATM_SD(sock)->flags))
sock->state = SS_CONNECTED;
return 0;
}
-int atm_recvmsg(struct socket *sock,struct msghdr *m,int total_len,
- int flags,struct scm_cookie *scm)
+int vcc_recvmsg(struct socket *sock, struct msghdr *msg,
+ int size, int flags, struct scm_cookie *scm)
{
- DECLARE_WAITQUEUE(wait,current);
- struct atm_vcc *vcc;
- struct sk_buff *skb;
- int eff_len,error;
- void *buff;
- int size;
-
- if (sock->state != SS_CONNECTED) return -ENOTCONN;
- if (flags & ~MSG_DONTWAIT) return -EOPNOTSUPP;
- if (m->msg_iovlen != 1) return -ENOSYS; /* fix this later @@@ */
- buff = m->msg_iov->iov_base;
- size = m->msg_iov->iov_len;
- vcc = ATM_SD(sock);
- add_wait_queue(&vcc->sleep,&wait);
- set_current_state(TASK_INTERRUPTIBLE);
- error = 1; /* <= 0 is error */
- while (!(skb = skb_dequeue(&vcc->sk->receive_queue))) {
- if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
- test_bit(ATM_VF_CLOSE,&vcc->flags)) {
- error = vcc->reply;
- break;
- }
- if (!test_bit(ATM_VF_READY,&vcc->flags)) {
- error = 0;
- break;
- }
- if (flags & MSG_DONTWAIT) {
- error = -EAGAIN;
- break;
- }
- schedule();
- set_current_state(TASK_INTERRUPTIBLE);
- if (signal_pending(current)) {
- error = -ERESTARTSYS;
- break;
- }
- }
- set_current_state(TASK_RUNNING);
- remove_wait_queue(&vcc->sleep,&wait);
- if (error <= 0) return error;
- sock_recv_timestamp(m, vcc->sk, skb);
- eff_len = skb->len > size ? size : skb->len;
- if (skb->len > size) /* Not fit ? Report it... */
- m->msg_flags |= MSG_TRUNC;
+ struct sock *sk = sock->sk;
+ struct atm_vcc *vcc;
+ struct sk_buff *skb;
+ int copied, error = -EINVAL;
+
+ if (sock->state != SS_CONNECTED)
+ return -ENOTCONN;
+ if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */
+ return -EOPNOTSUPP;
+ vcc = ATM_SD(sock);
+ if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
+ test_bit(ATM_VF_CLOSE,&vcc->flags))
+ return vcc->reply;
+ if (!test_bit(ATM_VF_READY, &vcc->flags))
+ return 0;
+
+ skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &error);
+ if (!skb)
+ return error;
+
+ copied = skb->len;
+ if (copied > size) {
+ copied = size;
+ msg->msg_flags |= MSG_TRUNC;
+ }
+
+ error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+ if (error)
+ return error;
+ sock_recv_timestamp(msg, sk, skb);
if (vcc->dev->ops->feedback)
- vcc->dev->ops->feedback(vcc,skb,(unsigned long) skb->data,
- (unsigned long) buff,eff_len);
- DPRINTK("RcvM %d -= %d\n",atomic_read(&vcc->sk->rmem_alloc),skb->truesize);
- atm_return(vcc,skb->truesize);
- error = copy_to_user(buff,skb->data,eff_len) ? -EFAULT : 0;
- kfree_skb(skb);
- return error ? error : eff_len;
+ vcc->dev->ops->feedback(vcc, skb, (unsigned long) skb->data,
+ (unsigned long) msg->msg_iov->iov_base, copied);
+ DPRINTK("RcvM %d -= %d\n", atomic_read(&vcc->sk->rmem_alloc), skb->truesize);
+ atm_return(vcc, skb->truesize);
+ skb_free_datagram(sk, skb);
+ return copied;
}
+
+
-
-int atm_sendmsg(struct socket *sock,struct msghdr *m,int total_len,
- struct scm_cookie *scm)
+int vcc_sendmsg(struct socket *sock, struct msghdr *m, int total_len,
+ struct scm_cookie *scm)
{
+ struct sock *sk = sock->sk;
DECLARE_WAITQUEUE(wait,current);
- struct atm_vcc *vcc;
- struct sk_buff *skb;
- int eff,error;
- const void *buff;
- int size;
-
- if (sock->state != SS_CONNECTED) return -ENOTCONN;
- if (m->msg_name) return -EISCONN;
- if (m->msg_iovlen != 1) return -ENOSYS; /* fix this later @@@ */
- buff = m->msg_iov->iov_base;
- size = m->msg_iov->iov_len;
- vcc = ATM_SD(sock);
- if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
- test_bit(ATM_VF_CLOSE,&vcc->flags))
- return vcc->reply;
- if (!test_bit(ATM_VF_READY,&vcc->flags)) return -EPIPE;
- if (!size) return 0;
- if (size < 0 || size > vcc->qos.txtp.max_sdu) return -EMSGSIZE;
- /* verify_area is done by net/socket.c */
- eff = (size+3) & ~3; /* align to word boundary */
- add_wait_queue(&vcc->sleep,&wait);
+ struct atm_vcc *vcc;
+ struct sk_buff *skb;
+ int eff,error;
+ const void *buff;
+ int size;
+
+ lock_sock(sk);
+ if (sock->state != SS_CONNECTED) {
+ error = -ENOTCONN;
+ goto out;
+ }
+ if (m->msg_name) {
+ error = -EISCONN;
+ goto out;
+ }
+ if (m->msg_iovlen != 1) {
+ error = -ENOSYS; /* fix this later @@@ */
+ goto out;
+ }
+ buff = m->msg_iov->iov_base;
+ size = m->msg_iov->iov_len;
+ vcc = ATM_SD(sock);
+ if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
+ test_bit(ATM_VF_CLOSE, &vcc->flags)) {
+ error = vcc->reply;
+ goto out;
+ }
+ if (!test_bit(ATM_VF_READY, &vcc->flags)) {
+ error = -EPIPE;
+ goto out;
+ }
+ if (!size) {
+ error = 0;
+ goto out;
+ }
+ if (size < 0 || size > vcc->qos.txtp.max_sdu) {
+ error = -EMSGSIZE;
+ goto out;
+ }
+ /* verify_area is done by net/socket.c */
+ eff = (size+3) & ~3; /* align to word boundary */
+ add_wait_queue(&vcc->sleep,&wait);
set_current_state(TASK_INTERRUPTIBLE);
- error = 0;
- while (!(skb = alloc_tx(vcc,eff))) {
- if (m->msg_flags & MSG_DONTWAIT) {
+ error = 0;
+ while (!(skb = alloc_tx(vcc,eff))) {
+ if (m->msg_flags & MSG_DONTWAIT) {
error = -EAGAIN;
break;
}
@@ -485,16 +612,21 @@
}
set_current_state(TASK_RUNNING);
remove_wait_queue(&vcc->sleep,&wait);
- if (error) return error;
+ if (error)
+ goto out;
skb->dev = NULL; /* for paths shared with net_device interfaces */
ATM_SKB(skb)->atm_options = vcc->atm_options;
if (copy_from_user(skb_put(skb,size),buff,size)) {
kfree_skb(skb);
- return -EFAULT;
+ error = -EFAULT;
+ goto out;
}
if (eff != size) memset(skb->data+size,0,eff-size);
error = vcc->dev->ops->send(vcc,skb);
- return error ? error : size;
+ error = error ? error : size;
+out:
+ release_sock(sk);
+ return error;
}
@@ -506,7 +638,7 @@
vcc = ATM_SD(sock);
poll_wait(file,&vcc->sleep,wait);
mask = 0;
- if (skb_peek(&vcc->sk->receive_queue) || skb_peek(&vcc->listenq))
+ if (skb_peek(&vcc->sk->receive_queue))
mask |= POLLIN | POLLRDNORM;
if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
test_bit(ATM_VF_CLOSE,&vcc->flags))
@@ -524,129 +656,51 @@
}
-static void copy_aal_stats(struct k_atm_aal_stats *from,
- struct atm_aal_stats *to)
-{
-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
- __AAL_STAT_ITEMS
-#undef __HANDLE_ITEM
-}
-
-
-static void subtract_aal_stats(struct k_atm_aal_stats *from,
- struct atm_aal_stats *to)
+int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
-#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
- __AAL_STAT_ITEMS
-#undef __HANDLE_ITEM
-}
-
-
-static int fetch_stats(struct atm_dev *dev,struct atm_dev_stats *arg,int zero)
-{
- struct atm_dev_stats tmp;
- int error = 0;
-
- copy_aal_stats(&dev->stats.aal0,&tmp.aal0);
- copy_aal_stats(&dev->stats.aal34,&tmp.aal34);
- copy_aal_stats(&dev->stats.aal5,&tmp.aal5);
- if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
- if (zero && !error) {
- subtract_aal_stats(&dev->stats.aal0,&tmp.aal0);
- subtract_aal_stats(&dev->stats.aal34,&tmp.aal34);
- subtract_aal_stats(&dev->stats.aal5,&tmp.aal5);
- }
- return error ? -EFAULT : 0;
-}
-
-
-int atm_ioctl(struct socket *sock,unsigned int cmd,unsigned long arg)
-{
- struct atm_dev *dev;
- struct list_head *p;
struct atm_vcc *vcc;
- int *tmp_buf, *tmp_p;
- void *buf;
- int error,len,size,number, ret_val;
+ int error;
- ret_val = 0;
vcc = ATM_SD(sock);
switch (cmd) {
case SIOCOUTQ:
if (sock->state != SS_CONNECTED ||
- !test_bit(ATM_VF_READY,&vcc->flags)) {
- ret_val = -EINVAL;
+ !test_bit(ATM_VF_READY, &vcc->flags)) {
+ error = -EINVAL;
goto done;
}
- ret_val = put_user(vcc->sk->sndbuf-
- atomic_read(&vcc->sk->wmem_alloc),
- (int *) arg) ? -EFAULT : 0;
+ error = put_user(vcc->sk->sndbuf-
+ atomic_read(&vcc->sk->wmem_alloc),
+ (int *) arg) ? -EFAULT : 0;
goto done;
case SIOCINQ:
{
struct sk_buff *skb;
if (sock->state != SS_CONNECTED) {
- ret_val = -EINVAL;
+ error = -EINVAL;
goto done;
}
skb = skb_peek(&vcc->sk->receive_queue);
- ret_val = put_user(skb ? skb->len : 0,(int *) arg)
- ? -EFAULT : 0;
- goto done;
- }
- case ATM_GETNAMES:
- if (get_user(buf,
- &((struct atm_iobuf *) arg)->buffer)) {
- ret_val = -EFAULT;
+ error = put_user(skb ? skb->len : 0,
+ (int *) arg) ? -EFAULT : 0;
goto done;
}
- if (get_user(len,
- &((struct atm_iobuf *) arg)->length)) {
- ret_val = -EFAULT;
- goto done;
- }
- size = 0;
- spin_lock(&atm_dev_lock);
- list_for_each(p, &atm_devs)
- size += sizeof(int);
- if (size > len) {
- spin_unlock(&atm_dev_lock);
- ret_val = -E2BIG;
- goto done;
- }
- tmp_buf = kmalloc(size, GFP_ATOMIC);
- if (!tmp_buf) {
- spin_unlock(&atm_dev_lock);
- ret_val = -ENOMEM;
- goto done;
- }
- tmp_p = tmp_buf;
- list_for_each(p, &atm_devs) {
- dev = list_entry(p, struct atm_dev, dev_list);
- *tmp_p++ = dev->number;
- }
- spin_unlock(&atm_dev_lock);
- ret_val = ((copy_to_user(buf, tmp_buf, size)) ||
- put_user(size, &((struct atm_iobuf *) arg)->length)
- ) ? -EFAULT : 0;
- kfree(tmp_buf);
- goto done;
case SIOCGSTAMP: /* borrowed from IP */
if (!vcc->sk->stamp.tv_sec) {
- ret_val = -ENOENT;
+ error = -ENOENT;
goto done;
}
- ret_val = copy_to_user((void *) arg, &vcc->sk->stamp,
- sizeof(struct timeval)) ? -EFAULT : 0;
+ error = copy_to_user((void *) arg, &vcc->sk->stamp,
+ sizeof(struct timeval)) ? -EFAULT : 0;
goto done;
case ATM_SETSC:
printk(KERN_WARNING "ATM_SETSC is obsolete\n");
- ret_val = 0;
+ error = 0;
goto done;
case ATMSIGD_CTRL:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
/*
@@ -657,28 +711,29 @@
* have the same privledges that /proc/kcore needs
*/
if (!capable(CAP_SYS_RAWIO)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
error = sigd_attach(vcc);
- if (!error) sock->state = SS_CONNECTED;
- ret_val = error;
+ if (!error)
+ sock->state = SS_CONNECTED;
goto done;
#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
case SIOCMKCLIP:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (try_atm_clip_ops()) {
- ret_val = atm_clip_ops->clip_create(arg);
- __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
+ error = atm_clip_ops->clip_create(arg);
+ if (atm_clip_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
} else
- ret_val = -ENOSYS;
+ error = -ENOSYS;
goto done;
case ATMARPD_CTRL:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
#if defined(CONFIG_ATM_CLIP_MODULE)
@@ -687,324 +742,194 @@
#endif
if (try_atm_clip_ops()) {
error = atm_clip_ops->atm_init_atmarp(vcc);
- __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
+ if (atm_clip_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
if (!error)
sock->state = SS_CONNECTED;
- ret_val = error;
} else
- ret_val = -ENOSYS;
+ error = -ENOSYS;
goto done;
case ATMARP_MKIP:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (try_atm_clip_ops()) {
- ret_val = atm_clip_ops->clip_mkip(vcc, arg);
- __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
+ error = atm_clip_ops->clip_mkip(vcc, arg);
+ if (atm_clip_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
} else
- ret_val = -ENOSYS;
+ error = -ENOSYS;
goto done;
case ATMARP_SETENTRY:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (try_atm_clip_ops()) {
- ret_val = atm_clip_ops->clip_setentry(vcc, arg);
- __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
+ error = atm_clip_ops->clip_setentry(vcc, arg);
+ if (atm_clip_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
} else
- ret_val = -ENOSYS;
+ error = -ENOSYS;
goto done;
case ATMARP_ENCAP:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (try_atm_clip_ops()) {
- ret_val = atm_clip_ops->clip_encap(vcc, arg);
- __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
+ error = atm_clip_ops->clip_encap(vcc, arg);
+ if (atm_clip_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_clip_ops->owner);
} else
- ret_val = -ENOSYS;
+ error = -ENOSYS;
goto done;
#endif
#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
case ATMLEC_CTRL:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done;
- }
- if (atm_lane_ops.lecd_attach == NULL)
- atm_lane_init();
- if (atm_lane_ops.lecd_attach == NULL) { /* try again */
- ret_val = -ENOSYS;
+ error = -EPERM;
goto done;
}
- error = atm_lane_ops.lecd_attach(vcc, (int)arg);
- if (error >= 0) sock->state = SS_CONNECTED;
- ret_val = error;
+#if defined(CONFIG_ATM_LANE_MODULE)
+ if (!atm_lane_ops)
+ request_module("lec");
+#endif
+ if (try_atm_lane_ops()) {
+ error = atm_lane_ops->lecd_attach(vcc, (int) arg);
+ if (atm_lane_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_lane_ops->owner);
+ if (error >= 0)
+ sock->state = SS_CONNECTED;
+ } else
+ error = -ENOSYS;
goto done;
case ATMLEC_MCAST:
- if (!capable(CAP_NET_ADMIN))
- ret_val = -EPERM;
- else
- ret_val = atm_lane_ops.mcast_attach(vcc, (int)arg);
+ if (!capable(CAP_NET_ADMIN)) {
+ error = -EPERM;
+ goto done;
+ }
+ if (try_atm_lane_ops()) {
+ error = atm_lane_ops->mcast_attach(vcc, (int) arg);
+ if (atm_lane_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_lane_ops->owner);
+ } else
+ error = -ENOSYS;
goto done;
case ATMLEC_DATA:
- if (!capable(CAP_NET_ADMIN))
- ret_val = -EPERM;
- else
- ret_val = atm_lane_ops.vcc_attach(vcc, (void*)arg);
+ if (!capable(CAP_NET_ADMIN)) {
+ error = -EPERM;
+ goto done;
+ }
+ if (try_atm_lane_ops()) {
+ error = atm_lane_ops->vcc_attach(vcc, (void *) arg);
+ if (atm_lane_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_lane_ops->owner);
+ } else
+ error = -ENOSYS;
goto done;
#endif
#if defined(CONFIG_ATM_MPOA) || defined(CONFIG_ATM_MPOA_MODULE)
case ATMMPC_CTRL:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
- if (atm_mpoa_ops.mpoad_attach == NULL)
- atm_mpoa_init();
- if (atm_mpoa_ops.mpoad_attach == NULL) { /* try again */
- ret_val = -ENOSYS;
- goto done;
- }
- error = atm_mpoa_ops.mpoad_attach(vcc, (int)arg);
- if (error >= 0) sock->state = SS_CONNECTED;
- ret_val = error;
+#if defined(CONFIG_ATM_MPOA_MODULE)
+ if (!atm_mpoa_ops)
+ request_module("mpoa");
+#endif
+ if (try_atm_mpoa_ops()) {
+ error = atm_mpoa_ops->mpoad_attach(vcc, (int) arg);
+ if (atm_mpoa_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_mpoa_ops->owner);
+ if (error >= 0)
+ sock->state = SS_CONNECTED;
+ } else
+ error = -ENOSYS;
goto done;
case ATMMPC_DATA:
- if (!capable(CAP_NET_ADMIN))
- ret_val = -EPERM;
- else
- ret_val = atm_mpoa_ops.vcc_attach(vcc, arg);
+ if (!capable(CAP_NET_ADMIN)) {
+ error = -EPERM;
+ goto done;
+ }
+ if (try_atm_mpoa_ops()) {
+ error = atm_mpoa_ops->vcc_attach(vcc, arg);
+ if (atm_mpoa_ops->owner)
+ __MOD_DEC_USE_COUNT(atm_mpoa_ops->owner);
+ } else
+ error = -ENOSYS;
goto done;
#endif
#if defined(CONFIG_ATM_TCP) || defined(CONFIG_ATM_TCP_MODULE)
case SIOCSIFATMTCP:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (!atm_tcp_ops.attach) {
- ret_val = -ENOPKG;
+ error = -ENOPKG;
goto done;
}
- fops_get (&atm_tcp_ops);
- error = atm_tcp_ops.attach(vcc,(int) arg);
- if (error >= 0) sock->state = SS_CONNECTED;
- else fops_put (&atm_tcp_ops);
- ret_val = error;
+ fops_get(&atm_tcp_ops);
+ error = atm_tcp_ops.attach(vcc, (int) arg);
+ if (error >= 0)
+ sock->state = SS_CONNECTED;
+ else
+ fops_put(&atm_tcp_ops);
goto done;
case ATMTCP_CREATE:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (!atm_tcp_ops.create_persistent) {
- ret_val = -ENOPKG;
+ error = -ENOPKG;
goto done;
}
error = atm_tcp_ops.create_persistent((int) arg);
- if (error < 0) fops_put (&atm_tcp_ops);
- ret_val = error;
+ if (error < 0)
+ fops_put(&atm_tcp_ops);
goto done;
case ATMTCP_REMOVE:
if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
+ error = -EPERM;
goto done;
}
if (!atm_tcp_ops.remove_persistent) {
- ret_val = -ENOPKG;
+ error = -ENOPKG;
goto done;
}
error = atm_tcp_ops.remove_persistent((int) arg);
- fops_put (&atm_tcp_ops);
- ret_val = error;
+ fops_put(&atm_tcp_ops);
goto done;
#endif
default:
break;
}
+ error = -ENOIOCTLCMD;
#if defined(CONFIG_PPPOATM) || defined(CONFIG_PPPOATM_MODULE)
- if (pppoatm_ioctl_hook) {
- ret_val = pppoatm_ioctl_hook(vcc, cmd, arg);
- if (ret_val != -ENOIOCTLCMD)
- goto done;
- }
+ down(&pppoatm_ioctl_mutex);
+ if (pppoatm_ioctl_hook)
+ error = pppoatm_ioctl_hook(vcc, cmd, arg);
+ up(&pppoatm_ioctl_mutex);
+ if (error != -ENOIOCTLCMD)
+ goto done;
#endif
#if defined(CONFIG_ATM_BR2684) || defined(CONFIG_ATM_BR2684_MODULE)
- if (br2684_ioctl_hook) {
- ret_val = br2684_ioctl_hook(vcc, cmd, arg);
- if (ret_val != -ENOIOCTLCMD)
- goto done;
- }
-#endif
-
- if (get_user(buf,&((struct atmif_sioc *) arg)->arg)) {
- ret_val = -EFAULT;
- goto done;
- }
- if (get_user(len,&((struct atmif_sioc *) arg)->length)) {
- ret_val = -EFAULT;
+ down(&br2684_ioctl_mutex);
+ if (br2684_ioctl_hook)
+ error = br2684_ioctl_hook(vcc, cmd, arg);
+ up(&br2684_ioctl_mutex);
+ if (error != -ENOIOCTLCMD)
goto done;
- }
- if (get_user(number,&((struct atmif_sioc *) arg)->number)) {
- ret_val = -EFAULT;
- goto done;
- }
- if (!(dev = atm_dev_lookup(number))) {
- ret_val = -ENODEV;
- goto done;
- }
-
- size = 0;
- switch (cmd) {
- case ATM_GETTYPE:
- size = strlen(dev->type)+1;
- if (copy_to_user(buf,dev->type,size)) {
- ret_val = -EFAULT;
- goto done_release;
- }
- break;
- case ATM_GETESI:
- size = ESI_LEN;
- if (copy_to_user(buf,dev->esi,size)) {
- ret_val = -EFAULT;
- goto done_release;
- }
- break;
- case ATM_SETESI:
- {
- int i;
-
- for (i = 0; i < ESI_LEN; i++)
- if (dev->esi[i]) {
- ret_val = -EEXIST;
- goto done_release;
- }
- }
- /* fall through */
- case ATM_SETESIF:
- {
- unsigned char esi[ESI_LEN];
-
- if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done_release;
- }
- if (copy_from_user(esi,buf,ESI_LEN)) {
- ret_val = -EFAULT;
- goto done_release;
- }
- memcpy(dev->esi,esi,ESI_LEN);
- ret_val = ESI_LEN;
- goto done_release;
- }
- case ATM_GETSTATZ:
- if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done_release;
- }
- /* fall through */
- case ATM_GETSTAT:
- size = sizeof(struct atm_dev_stats);
- error = fetch_stats(dev,buf,cmd == ATM_GETSTATZ);
- if (error) {
- ret_val = error;
- goto done_release;
- }
- break;
- case ATM_GETCIRANGE:
- size = sizeof(struct atm_cirange);
- if (copy_to_user(buf,&dev->ci_range,size)) {
- ret_val = -EFAULT;
- goto done_release;
- }
- break;
- case ATM_GETLINKRATE:
- size = sizeof(int);
- if (copy_to_user(buf,&dev->link_rate,size)) {
- ret_val = -EFAULT;
- goto done_release;
- }
- break;
- case ATM_RSTADDR:
- if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done_release;
- }
- atm_reset_addr(dev);
- break;
- case ATM_ADDADDR:
- case ATM_DELADDR:
- if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done_release;
- }
- {
- struct sockaddr_atmsvc addr;
+#endif
- if (copy_from_user(&addr,buf,sizeof(addr))) {
- ret_val = -EFAULT;
- goto done_release;
- }
- if (cmd == ATM_ADDADDR)
- ret_val = atm_add_addr(dev,&addr);
- else
- ret_val = atm_del_addr(dev,&addr);
- goto done_release;
- }
- case ATM_GETADDR:
- size = atm_get_addr(dev,buf,len);
- if (size < 0)
- ret_val = size;
- else
- /* may return 0, but later on size == 0 means "don't
- write the length" */
- ret_val = put_user(size,
- &((struct atmif_sioc *) arg)->length) ? -EFAULT : 0;
- goto done_release;
- case ATM_SETLOOP:
- if (__ATM_LM_XTRMT((int) (long) buf) &&
- __ATM_LM_XTLOC((int) (long) buf) >
- __ATM_LM_XTRMT((int) (long) buf)) {
- ret_val = -EINVAL;
- goto done_release;
- }
- /* fall through */
- case ATM_SETCIRANGE:
- case SONET_GETSTATZ:
- case SONET_SETDIAG:
- case SONET_CLRDIAG:
- case SONET_SETFRAMING:
- if (!capable(CAP_NET_ADMIN)) {
- ret_val = -EPERM;
- goto done_release;
- }
- /* fall through */
- default:
- if (!dev->ops->ioctl) {
- ret_val = -EINVAL;
- goto done_release;
- }
- size = dev->ops->ioctl(dev,cmd,buf);
- if (size < 0) {
- ret_val = (size == -ENOIOCTLCMD ? -EINVAL : size);
- goto done_release;
- }
- }
-
- if (size)
- ret_val = put_user(size,&((struct atmif_sioc *) arg)->length) ?
- -EFAULT : 0;
- else
- ret_val = 0;
-done_release:
- atm_dev_release(dev);
+ error = atm_dev_ioctl(cmd, arg);
done:
- return ret_val;
+ return error;
}
@@ -1062,14 +987,16 @@
return check_tp(&qos->rxtp);
}
-
-static int atm_do_setsockopt(struct socket *sock,int level,int optname,
- void *optval,int optlen)
+int vcc_setsockopt(struct socket *sock, int level, int optname,
+ char *optval, int optlen)
{
struct atm_vcc *vcc;
unsigned long value;
int error;
+ if (__SO_LEVEL_MATCH(optname, level) && optlen != __SO_SIZE(optname))
+ return -EINVAL;
+
vcc = ATM_SD(sock);
switch (optname) {
case SO_ATMQOS:
@@ -1103,10 +1030,16 @@
}
-static int atm_do_getsockopt(struct socket *sock,int level,int optname,
- void *optval,int optlen)
+int vcc_getsockopt(struct socket *sock, int level, int optname,
+ char *optval, int *optlen)
{
struct atm_vcc *vcc;
+ int len;
+
+ if (get_user(len, optlen))
+ return -EFAULT;
+ if (__SO_LEVEL_MATCH(optname, level) && len != __SO_SIZE(optname))
+ return -EINVAL;
vcc = ATM_SD(sock);
switch (optname) {
@@ -1137,65 +1070,10 @@
break;
}
if (!vcc->dev || !vcc->dev->ops->getsockopt) return -EINVAL;
- return vcc->dev->ops->getsockopt(vcc,level,optname,optval,optlen);
-}
-
-
-int atm_setsockopt(struct socket *sock,int level,int optname,char *optval,
- int optlen)
-{
- if (__SO_LEVEL_MATCH(optname, level) && optlen != __SO_SIZE(optname))
- return -EINVAL;
- return atm_do_setsockopt(sock,level,optname,optval,optlen);
+ return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len);
}
-int atm_getsockopt(struct socket *sock,int level,int optname,
- char *optval,int *optlen)
-{
- int len;
-
- if (get_user(len,optlen)) return -EFAULT;
- if (__SO_LEVEL_MATCH(optname, level) && len != __SO_SIZE(optname))
- return -EINVAL;
- return atm_do_getsockopt(sock,level,optname,optval,len);
-}
-
-
-/*
- * lane_mpoa_init.c: A couple of helper functions
- * to make modular LANE and MPOA client easier to implement
- */
-
-/*
- * This is how it goes:
- *
- * if xxxx is not compiled as module, call atm_xxxx_init_ops()
- * from here
- * else call atm_mpoa_init_ops() from init_module() within
- * the kernel when xxxx module is loaded
- *
- * In either case function pointers in struct atm_xxxx_ops
- * are initialized to their correct values. Either they
- * point to functions in the module or in the kernel
- */
-
-extern struct atm_mpoa_ops atm_mpoa_ops; /* in common.c */
-extern struct atm_lane_ops atm_lane_ops; /* in common.c */
-
-#if defined(CONFIG_ATM_MPOA) || defined(CONFIG_ATM_MPOA_MODULE)
-void atm_mpoa_init(void)
-{
-#ifndef CONFIG_ATM_MPOA_MODULE /* not module */
- atm_mpoa_init_ops(&atm_mpoa_ops);
-#else
- request_module("mpoa");
-#endif
-
- return;
-}
-#endif
-
#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br,
@@ -1206,18 +1084,8 @@
EXPORT_SYMBOL(br_fdb_put_hook);
#endif /* defined(CONFIG_ATM_LANE_MODULE) || defined(CONFIG_BRIDGE_MODULE) */
#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
+#endif /* defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) */
-void atm_lane_init(void)
-{
-#ifndef CONFIG_ATM_LANE_MODULE /* not module */
- atm_lane_init_ops(&atm_lane_ops);
-#else
- request_module("lec");
-#endif
-
- return;
-}
-#endif
static int __init atm_init(void)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)