18 files changed, 238 insertions, 51 deletions

diff --git a/net/atm/Makefile b/net/atm/Makefile
index d5818751f6..89656d6c0b 100644
--- a/net/atm/Makefile
+++ b/net/atm/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the ATM Protocol Families.
 #
 
-atm-y           := addr.o pvc.o signaling.o svc.o ioctl.o common.o atm_misc.o raw.o resources.o
+atm-y           := addr.o pvc.o signaling.o svc.o ioctl.o common.o atm_misc.o raw.o resources.o atm_sysfs.o
 mpoa-objs       := mpc.o mpoa_caches.o mpoa_proc.o
 
 obj-$(CONFIG_ATM) += atm.o
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
new file mode 100644
index 0000000000..5df4b9a068
--- /dev/null
+++ b/net/atm/atm_sysfs.c
@@ -0,0 +1,176 @@
+/* ATM driver model support. */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/kobject.h>
+#include <linux/atmdev.h>
+#include "common.h"
+#include "resources.h"
+
+#define to_atm_dev(cldev) container_of(cldev, struct atm_dev, class_dev)
+
+static ssize_t show_type(struct class_device *cdev, char *buf)
+{
+        struct atm_dev *adev = to_atm_dev(cdev);
+        return sprintf(buf, "%s\n", adev->type);
+}
+
+static ssize_t show_address(struct class_device *cdev, char *buf)
+{
+        char *pos = buf;
+        struct atm_dev *adev = to_atm_dev(cdev);
+        int i;
+
+        for (i = 0; i < (ESI_LEN - 1); i++)
+                pos += sprintf(pos, "%02x:", adev->esi[i]);
+        pos += sprintf(pos, "%02x\n", adev->esi[i]);
+
+        return pos - buf;
+}
+
+static ssize_t show_atmaddress(struct class_device *cdev, char *buf)
+{
+        unsigned long flags;
+        char *pos = buf;
+        struct atm_dev *adev = to_atm_dev(cdev);
+        struct atm_dev_addr *aaddr;
+        int bin[] = { 1, 2, 10, 6, 1 }, *fmt = bin;
+        int i, j;
+
+        spin_lock_irqsave(&adev->lock, flags);
+        list_for_each_entry(aaddr, &adev->local, entry) {
+                for(i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) {
+                        if (j == *fmt) {
+                                pos += sprintf(pos, ".");
+                                ++fmt;
+                                j = 0;
+                        }
+                        pos += sprintf(pos, "%02x", aaddr->addr.sas_addr.prv[i]);
+                }
+                pos += sprintf(pos, "\n");
+        }
+        spin_unlock_irqrestore(&adev->lock, flags);
+
+        return pos - buf;
+}
+
+static ssize_t show_carrier(struct class_device *cdev, char *buf)
+{
+        char *pos = buf;
+        struct atm_dev *adev = to_atm_dev(cdev);
+
+        pos += sprintf(pos, "%d\n",
+                       adev->signal == ATM_PHY_SIG_LOST ? 0 : 1);
+                
+        return pos - buf;
+}
+
+static ssize_t show_link_rate(struct class_device *cdev, char *buf)
+{
+        char *pos = buf;
+        struct atm_dev *adev = to_atm_dev(cdev);
+        int link_rate;
+
+        /* show the link rate, not the data rate */
+        switch (adev->link_rate) {
+                case ATM_OC3_PCR:
+                        link_rate = 155520000;
+                        break;
+                case ATM_OC12_PCR:
+                        link_rate = 622080000;
+                        break;
+                case ATM_25_PCR:
+                        link_rate = 25600000;
+                        break;
+                default:
+                        link_rate = adev->link_rate * 8 * 53;
+        }
+        pos += sprintf(pos, "%d\n", link_rate);
+                
+        return pos - buf;
+}
+
+static CLASS_DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
+static CLASS_DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL);
+static CLASS_DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL);
+static CLASS_DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
+static CLASS_DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL);
+
+static struct class_device_attribute *atm_attrs[] = {
+        &class_device_attr_atmaddress,
+        &class_device_attr_address,
+        &class_device_attr_carrier,
+        &class_device_attr_type,
+        &class_device_attr_link_rate,
+        NULL
+};
+
+static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
+{
+        struct atm_dev *adev;
+        int i = 0, len = 0;
+
+        if (!cdev)
+                return -ENODEV;
+
+        adev = to_atm_dev(cdev);
+        if (!adev)
+                return -ENODEV;
+
+        if (add_uevent_var(envp, num_envp, &i, buf, size, &len,
+                           "NAME=%s%d", adev->type, adev->number))
+                return -ENOMEM;
+
+        envp[i] = NULL;
+        return 0;
+}
+
+static void atm_release(struct class_device *cdev)
+{
+        struct atm_dev *adev = to_atm_dev(cdev);
+
+        kfree(adev);
+}
+
+static struct class atm_class = {
+        .name           = "atm",
+        .release        = atm_release,
+        .uevent         = atm_uevent,
+};
+
+int atm_register_sysfs(struct atm_dev *adev)
+{
+        struct class_device *cdev = &adev->class_dev;
+        int i, err;
+
+        cdev->class = &atm_class;
+        class_set_devdata(cdev, adev);
+
+        snprintf(cdev->class_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number);
+        err = class_device_register(cdev);
+        if (err < 0)
+                return err;
+
+        for (i = 0; atm_attrs[i]; i++)
+                class_device_create_file(cdev, atm_attrs[i]);
+
+        return 0;
+}
+
+void atm_unregister_sysfs(struct atm_dev *adev)
+{
+        struct class_device *cdev = &adev->class_dev;
+
+        class_device_del(cdev);
+}
+
+int __init atm_sysfs_init(void)
+{
+        return class_register(&atm_class);
+}
+
+void __exit atm_sysfs_exit(void)
+{
+        class_unregister(&atm_class);
+}
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 680ccb12aa..a487233dc4 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -5,7 +5,6 @@ Author: Marcell GAL, 2000, XDSL Ltd, Hungary
 */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 72d8529826..2e62105d91 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -2,7 +2,6 @@
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h> /* for UINT_MAX */
@@ -24,6 +23,7 @@
 #include <linux/if.h> /* for IFF_UP */
 #include <linux/inetdevice.h>
 #include <linux/bitops.h>
+#include <linux/poison.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/rcupdate.h>
@@ -98,7 +98,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
                 printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
                 return;
         }
-        spin_lock_bh(&entry->neigh->dev->xmit_lock);    /* block clip_start_xmit() */
+        netif_tx_lock_bh(entry->neigh->dev);    /* block clip_start_xmit() */
         entry->neigh->used = jiffies;
         for (walk = &entry->vccs; *walk; walk = &(*walk)->next)
                 if (*walk == clip_vcc) {
@@ -122,7 +122,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
         printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
                "0x%p)\n", entry, clip_vcc);
       out:
-        spin_unlock_bh(&entry->neigh->dev->xmit_lock);
+        netif_tx_unlock_bh(entry->neigh->dev);
 }
 
 /* The neighbour entry n->lock is held. */
@@ -267,7 +267,7 @@ static void clip_neigh_destroy(struct neighbour *neigh)
         DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh);
         if (NEIGH2ENTRY(neigh)->vccs)
                 printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n");
-        NEIGH2ENTRY(neigh)->vccs = (void *) 0xdeadbeef;
+        NEIGH2ENTRY(neigh)->vccs = (void *) NEIGHBOR_DEAD;
 }
 
 static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb)
@@ -962,7 +962,6 @@ static struct file_operations arp_seq_fops = {
 
 static int __init atm_clip_init(void)
 {
-        struct proc_dir_entry *p;
         neigh_table_init_no_netlink(&clip_tbl);
 
         clip_tbl_hook = &clip_tbl;
@@ -972,9 +971,15 @@ static int __init atm_clip_init(void)
 
         setup_timer(&idle_timer, idle_timer_check, 0);
 
-        p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
-        if (p)
-                p->proc_fops = &arp_seq_fops;
+#ifdef CONFIG_PROC_FS
+        {
+                struct proc_dir_entry *p;
+
+                p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
+                if (p)
+                        p->proc_fops = &arp_seq_fops;
+        }
+#endif
 
         return 0;
 }
diff --git a/net/atm/common.c b/net/atm/common.c
index ae002220fa..fbabff4944 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -3,7 +3,6 @@
 /* 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 */
@@ -791,8 +790,14 @@ 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:
@@ -805,6 +810,7 @@ out_unregister_vcc_proto:
 static void __exit atm_exit(void)
 {
         atm_proc_exit();
+        atm_sysfs_exit();
         atmsvc_exit();
         atmpvc_exit();
         proto_unregister(&vcc_proto);
diff --git a/net/atm/common.h b/net/atm/common.h
index 4887c317ce..a422da7788 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -28,6 +28,8 @@ int atmpvc_init(void);
 void atmpvc_exit(void);
 int atmsvc_init(void);
 void atmsvc_exit(void);
+int atm_sysfs_init(void);
+void atm_sysfs_exit(void);
 
 #ifdef CONFIG_PROC_FS
 int atm_proc_init(void);
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 851cfa6312..8c2022c3e8 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -4,7 +4,6 @@
 /* 2003 John Levon  <levon@movementarian.org> */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/net.h>          /* struct socket, struct proto_ops */
diff --git a/net/atm/ipcommon.c b/net/atm/ipcommon.c
index 4b1faca501..1d3de42fad 100644
--- a/net/atm/ipcommon.c
+++ b/net/atm/ipcommon.c
@@ -25,22 +25,27 @@
 /*
  * skb_migrate appends the list at "from" to "to", emptying "from" in the
  * process. skb_migrate is atomic with respect to all other skb operations on
- * "from" and "to". Note that it locks both lists at the same time, so beware
- * of potential deadlocks.
+ * "from" and "to". Note that it locks both lists at the same time, so to deal
+ * with the lock ordering, the locks are taken in address order.
  *
  * This function should live in skbuff.c or skbuff.h.
  */
 
 
-void skb_migrate(struct sk_buff_head *from,struct sk_buff_head *to)
+void skb_migrate(struct sk_buff_head *from, struct sk_buff_head *to)
 {
         unsigned long flags;
         struct sk_buff *skb_from = (struct sk_buff *) from;
         struct sk_buff *skb_to = (struct sk_buff *) to;
         struct sk_buff *prev;
 
-        spin_lock_irqsave(&from->lock,flags);
-        spin_lock(&to->lock);
+        if ((unsigned long) from < (unsigned long) to) {
+                spin_lock_irqsave(&from->lock, flags);
+                spin_lock_nested(&to->lock, SINGLE_DEPTH_NESTING);
+        } else {
+                spin_lock_irqsave(&to->lock, flags);
+                spin_lock_nested(&from->lock, SINGLE_DEPTH_NESTING);
+        }
         prev = from->prev;
         from->next->prev = to->prev;
         prev->next = skb_to;
@@ -51,7 +56,7 @@ void skb_migrate(struct sk_buff_head *from,struct sk_buff_head *to)
         from->prev = skb_from;
         from->next = skb_from;
         from->qlen = 0;
-        spin_unlock_irqrestore(&from->lock,flags);
+        spin_unlock_irqrestore(&from->lock, flags);
 }
 
 
diff --git a/net/atm/lec.c b/net/atm/lec.c
index c4fc722fef..4b68a18171 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -4,7 +4,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/capability.h>
diff --git a/net/atm/lec.h b/net/atm/lec.h
index 6606082b29..c22a8bfa1f 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -9,7 +9,6 @@
 #ifndef _LEC_H_
 #define _LEC_H_
 
-#include <linux/config.h>
 #include <linux/atmdev.h>
 #include <linux/netdevice.h>
 #include <linux/atmlec.h>
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index c304ef1513..9aafe1e2f0 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -25,7 +25,6 @@
 #include <linux/atmlec.h>
 #include <linux/atmmpc.h>
 /* Modular too */
-#include <linux/config.h>
 #include <linux/module.h>
 
 #include "lec.h"
@@ -229,20 +228,15 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry)
 /* this is buggered - we need locking for qos_head */
 void atm_mpoa_disp_qos(struct seq_file *m)
 {
-        unsigned char *ip;
-        char ipaddr[16];
         struct atm_mpoa_qos *qos;
 
         qos = qos_head;
         seq_printf(m, "QoS entries for shortcuts:\n");
         seq_printf(m, "IP address\n  TX:max_pcr pcr     min_pcr max_cdv max_sdu\n  RX:max_pcr pcr     min_pcr max_cdv max_sdu\n");
 
-        ipaddr[sizeof(ipaddr)-1] = '\0';
         while (qos != NULL) {
-                ip = (unsigned char *)&qos->ipaddr;
-                sprintf(ipaddr, "%u.%u.%u.%u", NIPQUAD(ip));
                 seq_printf(m, "%u.%u.%u.%u\n     %-7d %-7d %-7d %-7d %-7d\n     %-7d %-7d %-7d %-7d %-7d\n",
-                                NIPQUAD(ipaddr),
+                                NIPQUAD(qos->ipaddr),
                                 qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu,
                                 qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu);
                 qos = qos->next;
@@ -1083,7 +1077,6 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
 static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry)
 {
         uint32_t dst_ip = msg->content.in_info.in_dst_ip;
-        unsigned char *ip __attribute__ ((unused)) = (unsigned char *)&dst_ip;
         struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip);
         eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client);
 
@@ -1097,7 +1090,7 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien
                                     entry->shortcut = eg_entry->shortcut;
                 }
                 if(entry->shortcut){
-                        dprintk("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n",client->dev->name, NIPQUAD(ip));
+                        dprintk("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n",client->dev->name, NIPQUAD(dst_ip));
                         client->eg_ops->put(eg_entry);
                         return;
                 }
@@ -1119,12 +1112,10 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien
 
 static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
 {
-        unsigned char *ip;
-
         uint32_t dst_ip = msg->content.in_info.in_dst_ip;
         in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc);
-        ip = (unsigned char *)&dst_ip;
-        dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(ip));
+
+        dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(dst_ip));
         ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p", mpc->dev->name, entry);
         if(entry == NULL){
                 printk("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name);
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index 64ddebb640..781ed1b932 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -223,7 +223,6 @@ static void in_cache_remove_entry(in_cache_entry *entry,
    but an easy one... */
 static void clear_count_and_expired(struct mpoa_client *client)
 {
-        unsigned char *ip;
         in_cache_entry *entry, *next_entry;
         struct timeval now;
 
@@ -236,8 +235,7 @@ static void clear_count_and_expired(struct mpoa_client *client)
                 next_entry = entry->next;
                 if((now.tv_sec - entry->tv.tv_sec)
                    > entry->ctrl_info.holding_time){
-                        ip = (unsigned char*)&entry->ctrl_info.in_dst_ip;
-                        dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %u.%u.%u.%u\n", NIPQUAD(ip));
+                        dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %u.%u.%u.%u\n", NIPQUAD(entry->ctrl_info.in_dst_ip));
                         client->in_ops->remove_entry(entry, client);
                 }
                 entry = next_entry;
@@ -455,7 +453,6 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
 
 static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_client *client)
 {
-        unsigned char *ip;
         eg_cache_entry *entry = kmalloc(sizeof(eg_cache_entry), GFP_KERNEL);
 
         if (entry == NULL) {
@@ -463,8 +460,7 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
                 return NULL;
         }
 
-        ip = (unsigned char *)&msg->content.eg_info.eg_dst_ip;
-        dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n", NIPQUAD(ip));
+        dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n", NIPQUAD(msg->content.eg_info.eg_dst_ip));
         memset(entry, 0, sizeof(eg_cache_entry));
 
         atomic_set(&entry->use, 1);
@@ -481,8 +477,8 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
         do_gettimeofday(&(entry->tv));
         entry->entry_state = EGRESS_RESOLVED;
         dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %lu\n", ntohl(entry->ctrl_info.cache_id));
-        ip = (unsigned char *)&entry->ctrl_info.mps_ip;
-        dprintk("mpoa: mpoa_caches.c: mps_ip = %u.%u.%u.%u\n", NIPQUAD(ip));
+        dprintk("mpoa: mpoa_caches.c: mps_ip = %u.%u.%u.%u\n",
+                NIPQUAD(entry->ctrl_info.mps_ip));
         atomic_inc(&entry->use);
 
         write_unlock_irq(&client->egress_lock);
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index 60834b5a14..d37b8911b3 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 
 #ifdef CONFIG_PROC_FS
 #include <linux/errno.h>
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 1489067c1e..76a7d8ff6c 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -34,7 +34,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/atm.h>
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 4041054e52..3f95b0886a 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -8,7 +8,6 @@
  * the reader.
  */
 
-#include <linux/config.h>
 #include <linux/module.h> /* for EXPORT_SYMBOL */
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index f2c541774d..b2148b43a4 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -3,7 +3,6 @@
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
 
-#include <linux/config.h>
 #include <linux/net.h>          /* struct socket, struct proto_ops */
 #include <linux/atm.h>          /* ATM stuff */
 #include <linux/atmdev.h>       /* ATM devices */
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 18ac80698f..de25c6408b 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -8,7 +8,6 @@
  *           use the default destruct function initialized by sock_init_data */
 
 
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/atmdev.h>
@@ -114,14 +113,27 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
                 printk(KERN_ERR "atm_dev_register: "
                        "atm_proc_dev_register failed for dev %s\n",
                        type);
-                mutex_unlock(&atm_dev_mutex);
-                kfree(dev);
-                return NULL;
+                goto out_fail;
+        }
+
+        if (atm_register_sysfs(dev) < 0) {
+                printk(KERN_ERR "atm_dev_register: "
+                       "atm_register_sysfs failed for dev %s\n",
+                       type);
+                atm_proc_dev_deregister(dev);
+                goto out_fail;
         }
+
         list_add_tail(&dev->dev_list, &atm_devs);
-        mutex_unlock(&atm_dev_mutex);
 
+out:
+        mutex_unlock(&atm_dev_mutex);
         return dev;
+
+out_fail:
+        kfree(dev);
+        dev = NULL;
+        goto out;
 }
 
 
@@ -140,6 +152,7 @@ void atm_dev_deregister(struct atm_dev *dev)
         mutex_unlock(&atm_dev_mutex);
 
         atm_dev_release_vccs(dev);
+        atm_unregister_sysfs(dev);
         atm_proc_dev_deregister(dev);
 
         atm_dev_put(dev);
diff --git a/net/atm/resources.h b/net/atm/resources.h
index ac7222fee7..1d004aaaee 100644
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -6,7 +6,6 @@
 #ifndef NET_ATM_RESOURCES_H
 #define NET_ATM_RESOURCES_H
 
-#include <linux/config.h>
 #include <linux/atmdev.h>
 #include <linux/mutex.h>
 
@@ -43,4 +42,6 @@ static inline void atm_proc_dev_deregister(struct atm_dev *dev)
 
 #endif /* CONFIG_PROC_FS */
 
+int atm_register_sysfs(struct atm_dev *adev);
+void atm_unregister_sysfs(struct atm_dev *adev);
 #endif