drivers/ieee802154: add support for the at86rf230/231 transceivers

[cascardo/linux.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4955862..7260717 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -74,15 +74,14 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
                            int (*set)(struct net_device *, unsigned long))
 {
        struct net_device *net = to_net_dev(dev);
-       char *endp;
        unsigned long new;
        int ret = -EINVAL;
 
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
 
-       new = simple_strtoul(buf, &endp, 0);
-       if (endp == buf)
+       ret = kstrtoul(buf, 0, &new);
+       if (ret)
                goto err;
 
        if (!rtnl_trylock())
@@ -232,7 +231,7 @@ NETDEVICE_SHOW(flags, fmt_hex);
 
 static int change_flags(struct net_device *net, unsigned long new_flags)
 {
-       return dev_change_flags(net, (unsigned) new_flags);
+       return dev_change_flags(net, (unsigned int) new_flags);
 }
 
 static ssize_t store_flags(struct device *dev, struct device_attribute *attr,
@@ -418,72 +417,6 @@ static struct attribute_group netstat_group = {
        .name  = "statistics",
        .attrs  = netstat_attrs,
 };
-
-#ifdef CONFIG_WIRELESS_EXT_SYSFS
-/* helper function that does all the locking etc for wireless stats */
-static ssize_t wireless_show(struct device *d, char *buf,
-                            ssize_t (*format)(const struct iw_statistics *,
-                                              char *))
-{
-       struct net_device *dev = to_net_dev(d);
-       const struct iw_statistics *iw;
-       ssize_t ret = -EINVAL;
-
-       if (!rtnl_trylock())
-               return restart_syscall();
-       if (dev_isalive(dev)) {
-               iw = get_wireless_stats(dev);
-               if (iw)
-                       ret = (*format)(iw, buf);
-       }
-       rtnl_unlock();
-
-       return ret;
-}
-
-/* show function template for wireless fields */
-#define WIRELESS_SHOW(name, field, format_string)                      \
-static ssize_t format_iw_##name(const struct iw_statistics *iw, char *buf) \
-{                                                                      \
-       return sprintf(buf, format_string, iw->field);                  \
-}                                                                      \
-static ssize_t show_iw_##name(struct device *d,                                \
-                             struct device_attribute *attr, char *buf) \
-{                                                                      \
-       return wireless_show(d, buf, format_iw_##name);                 \
-}                                                                      \
-static DEVICE_ATTR(name, S_IRUGO, show_iw_##name, NULL)
-
-WIRELESS_SHOW(status, status, fmt_hex);
-WIRELESS_SHOW(link, qual.qual, fmt_dec);
-WIRELESS_SHOW(level, qual.level, fmt_dec);
-WIRELESS_SHOW(noise, qual.noise, fmt_dec);
-WIRELESS_SHOW(nwid, discard.nwid, fmt_dec);
-WIRELESS_SHOW(crypt, discard.code, fmt_dec);
-WIRELESS_SHOW(fragment, discard.fragment, fmt_dec);
-WIRELESS_SHOW(misc, discard.misc, fmt_dec);
-WIRELESS_SHOW(retries, discard.retries, fmt_dec);
-WIRELESS_SHOW(beacon, miss.beacon, fmt_dec);
-
-static struct attribute *wireless_attrs[] = {
-       &dev_attr_status.attr,
-       &dev_attr_link.attr,
-       &dev_attr_level.attr,
-       &dev_attr_noise.attr,
-       &dev_attr_nwid.attr,
-       &dev_attr_crypt.attr,
-       &dev_attr_fragment.attr,
-       &dev_attr_retries.attr,
-       &dev_attr_misc.attr,
-       &dev_attr_beacon.attr,
-       NULL
-};
-
-static struct attribute_group wireless_group = {
-       .name = "wireless",
-       .attrs = wireless_attrs,
-};
-#endif
 #endif /* CONFIG_SYSFS */
 
 #ifdef CONFIG_RPS
@@ -582,7 +515,7 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
                return err;
        }
 
-       map = kzalloc(max_t(unsigned,
+       map = kzalloc(max_t(unsigned int,
            RPS_MAP_SIZE(cpumask_weight(mask)), L1_CACHE_BYTES),
            GFP_KERNEL);
        if (!map) {
@@ -903,7 +836,7 @@ static ssize_t bql_set_hold_time(struct netdev_queue *queue,
                                 const char *buf, size_t len)
 {
        struct dql *dql = &queue->dql;
-       unsigned value;
+       unsigned int value;
        int err;
 
        err = kstrtouint(buf, 10, &value);
@@ -1107,7 +1040,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
                return err;
        }
 
-       new_dev_maps = kzalloc(max_t(unsigned,
+       new_dev_maps = kzalloc(max_t(unsigned int,
            XPS_DEV_MAPS_SIZE, L1_CACHE_BYTES), GFP_KERNEL);
        if (!new_dev_maps) {
                free_cpumask_var(mask);
@@ -1464,14 +1397,6 @@ int netdev_register_kobject(struct net_device *net)
                groups++;
 
        *groups++ = &netstat_group;
-#ifdef CONFIG_WIRELESS_EXT_SYSFS
-       if (net->ieee80211_ptr)
-               *groups++ = &wireless_group;
-#ifdef CONFIG_WIRELESS_EXT
-       else if (net->wireless_handlers)
-               *groups++ = &wireless_group;
-#endif
-#endif
 #endif /* CONFIG_SYSFS */
 
        error = device_add(dev);