Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

16 files changed, 206 insertions, 18 deletions

diff --git a/net/atm/Makefile b/net/atm/Makefile
index d5818751f6ba..89656d6c0b90 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 000000000000..5df4b9a068bb
--- /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 680ccb12aae8..a487233dc466 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 f92f9c94d2c7..87a454f5c89c 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 */
diff --git a/net/atm/common.c b/net/atm/common.c
index ae002220fa99..fbabff494468 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 4887c317cefe..a422da7788fb 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 851cfa6312af..8c2022c3e81d 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/lec.c b/net/atm/lec.c
index c4fc722fef9a..4b68a18171cf 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 6606082b29a8..c22a8bfa1f81 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 5fe77df00186..9aafe1e2f048 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"
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index 60834b5a14d6..d37b8911b3ab 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 1489067c1e84..76a7d8ff6c0e 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 4041054e5282..3f95b0886a6a 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 f2c541774dcd..b2148b43a426 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 18ac80698f83..de25c6408b04 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 ac7222fee7a8..1d004aaaeec1 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