mac80211: fix queue selection for data frames on monitor interfaces

[safe/jmp/linux-2.6] / net / atm / atm_sysfs.c

diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index 62f6ed1..b5674dc 100644 (file)
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -9,13 +9,15 @@
 
 #define to_atm_dev(cldev) container_of(cldev, struct atm_dev, class_dev)
 
-static ssize_t show_type(struct class_device *cdev, char *buf)
+static ssize_t show_type(struct device *cdev,
+                        struct device_attribute *attr, 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)
+static ssize_t show_address(struct device *cdev,
+                           struct device_attribute *attr, char *buf)
 {
        char *pos = buf;
        struct atm_dev *adev = to_atm_dev(cdev);
@@ -28,17 +30,18 @@ static ssize_t show_address(struct class_device *cdev, char *buf)
        return pos - buf;
 }
 
-static ssize_t show_atmaddress(struct class_device *cdev, char *buf)
+static ssize_t show_atmaddress(struct device *cdev,
+                              struct device_attribute *attr, char *buf)
 {
-        unsigned long flags;
+       unsigned long flags;
        char *pos = buf;
        struct atm_dev *adev = to_atm_dev(cdev);
-        struct atm_dev_addr *aaddr;
+       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) {
+       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, ".");
@@ -49,23 +52,25 @@ static ssize_t show_atmaddress(struct class_device *cdev, char *buf)
                }
                pos += sprintf(pos, "\n");
        }
-        spin_unlock_irqrestore(&adev->lock, flags);
+       spin_unlock_irqrestore(&adev->lock, flags);
 
        return pos - buf;
 }
 
-static ssize_t show_carrier(struct class_device *cdev, char *buf)
+static ssize_t show_carrier(struct device *cdev,
+                           struct device_attribute *attr, 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)
+static ssize_t show_link_rate(struct device *cdev,
+                             struct device_attribute *attr, char *buf)
 {
        char *pos = buf;
        struct atm_dev *adev = to_atm_dev(cdev);
@@ -86,29 +91,29 @@ static ssize_t show_link_rate(struct class_device *cdev, char *buf)
                        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,
+static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
+static DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL);
+static DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL);
+static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
+static DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL);
+
+static struct device_attribute *atm_attrs[] = {
+       &dev_attr_atmaddress,
+       &dev_attr_address,
+       &dev_attr_carrier,
+       &dev_attr_type,
+       &dev_attr_link_rate,
        NULL
 };
 
-static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
+
+static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env)
 {
        struct atm_dev *adev;
-       int i = 0, len = 0;
 
        if (!cdev)
                return -ENODEV;
@@ -117,15 +122,13 @@ static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char
        if (!adev)
                return -ENODEV;
 
-       if (add_uevent_var(envp, num_envp, &i, buf, size, &len,
-                          "NAME=%s%d", adev->type, adev->number))
+       if (add_uevent_var(env, "NAME=%s%d", adev->type, adev->number))
                return -ENOMEM;
 
-       envp[i] = NULL;
        return 0;
 }
 
-static void atm_release(struct class_device *cdev)
+static void atm_release(struct device *cdev)
 {
        struct atm_dev *adev = to_atm_dev(cdev);
 
@@ -134,25 +137,25 @@ static void atm_release(struct class_device *cdev)
 
 static struct class atm_class = {
        .name           = "atm",
-       .release        = atm_release,
-       .uevent         = atm_uevent,
+       .dev_release    = atm_release,
+       .dev_uevent             = atm_uevent,
 };
 
 int atm_register_sysfs(struct atm_dev *adev)
 {
-       struct class_device *cdev = &adev->class_dev;
+       struct device *cdev = &adev->class_dev;
        int i, j, err;
 
        cdev->class = &atm_class;
-       class_set_devdata(cdev, adev);
+       dev_set_drvdata(cdev, adev);
 
-       snprintf(cdev->class_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number);
-       err = class_device_register(cdev);
+       dev_set_name(cdev, "%s%d", adev->type, adev->number);
+       err = device_register(cdev);
        if (err < 0)
                return err;
 
        for (i = 0; atm_attrs[i]; i++) {
-               err = class_device_create_file(cdev, atm_attrs[i]);
+               err = device_create_file(cdev, atm_attrs[i]);
                if (err)
                        goto err_out;
        }
@@ -161,16 +164,16 @@ int atm_register_sysfs(struct atm_dev *adev)
 
 err_out:
        for (j = 0; j < i; j++)
-               class_device_remove_file(cdev, atm_attrs[j]);
-       class_device_del(cdev);
+               device_remove_file(cdev, atm_attrs[j]);
+       device_del(cdev);
        return err;
 }
 
 void atm_unregister_sysfs(struct atm_dev *adev)
 {
-       struct class_device *cdev = &adev->class_dev;
+       struct device *cdev = &adev->class_dev;
 
-       class_device_del(cdev);
+       device_del(cdev);
 }
 
 int __init atm_sysfs_init(void)