linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / atm / common.c

diff --git a/net/atm/common.c b/net/atm/common.c
index fbabff4..6656b11 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -3,6 +3,7 @@
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/net.h>         /* struct socket, struct proto_ops */
@@ -450,12 +451,12 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
                dev = try_then_request_module(atm_dev_lookup(itf), "atm-device-%d", itf);
        } else {
                dev = NULL;
-               mutex_lock(&atm_dev_mutex);
+               down(&atm_dev_mutex);
                if (!list_empty(&atm_devs)) {
                        dev = list_entry(atm_devs.next, struct atm_dev, dev_list);
                        atm_dev_hold(dev);
                }
-               mutex_unlock(&atm_dev_mutex);
+               up(&atm_dev_mutex);
        }
        if (!dev)
                return -ENODEV;
@@ -790,14 +791,8 @@ static int __init atm_init(void)
                printk(KERN_ERR "atm_proc_init() failed with %d\n",error);
                goto out_atmsvc_exit;
        }
-        if ((error = atm_sysfs_init()) < 0) {
-               printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error);
-               goto out_atmproc_exit;
-       }
 out:
        return error;
-out_atmproc_exit:
-       atm_proc_exit();
 out_atmsvc_exit:
        atmsvc_exit();
 out_atmpvc_exit:
@@ -810,7 +805,6 @@ out_unregister_vcc_proto:
 static void __exit atm_exit(void)
 {
        atm_proc_exit();
-       atm_sysfs_exit();
        atmsvc_exit();
        atmpvc_exit();
        proto_unregister(&vcc_proto);