Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: style cleanups

Browse source 
Make code closer to current style. Mostly whitespace changes.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2017-08-18 13:46:28 -07:00 • committed by David S. Miller
parent 667e427bc3
commit 6648c65e7e
1 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
net/core/net-sysfs.c
View file

@ -97,7 +97,8 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
return restart_syscall(); return restart_syscall();
if (dev_isalive(netdev)) { if (dev_isalive(netdev)) {
if ((ret = (*set)(netdev, new)) == 0) ret = (*set)(netdev, new);
if (ret == 0)
ret = len; ret = len;
} }
rtnl_unlock(); rtnl_unlock();
@ -160,6 +161,7 @@ static ssize_t broadcast_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct net_device *ndev = to_net_dev(dev); struct net_device *ndev = to_net_dev(dev);
if (dev_isalive(ndev)) if (dev_isalive(ndev))
return sysfs_format_mac(buf, ndev->broadcast, ndev->addr_len); return sysfs_format_mac(buf, ndev->broadcast, ndev->addr_len);
return -EINVAL; return -EINVAL;
@ -183,9 +185,10 @@ static ssize_t carrier_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct net_device *netdev = to_net_dev(dev); struct net_device *netdev = to_net_dev(dev);
if (netif_running(netdev)) {
if (netif_running(netdev))
return sprintf(buf, fmt_dec, !!netif_carrier_ok(netdev)); return sprintf(buf, fmt_dec, !!netif_carrier_ok(netdev));
}
return -EINVAL; return -EINVAL;
} }
static DEVICE_ATTR_RW(carrier); static DEVICE_ATTR_RW(carrier);
@ -290,6 +293,7 @@ static ssize_t carrier_changes_show(struct device *dev,
char *buf) char *buf)
{ {
struct net_device *netdev = to_net_dev(dev); struct net_device *netdev = to_net_dev(dev);
return sprintf(buf, fmt_dec, return sprintf(buf, fmt_dec,
atomic_read(&netdev->carrier_changes)); atomic_read(&netdev->carrier_changes));
} }
@ -625,7 +629,6 @@ static struct attribute *netstat_attrs[] __ro_after_init = {
NULL NULL
}; };
static const struct attribute_group netstat_group = { static const struct attribute_group netstat_group = {
.name = "statistics", .name = "statistics",
.attrs = netstat_attrs, .attrs = netstat_attrs,
@ -647,8 +650,8 @@ static const struct attribute_group wireless_group = {
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SYSFS */
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
#define to_rx_queue_attr(_attr) container_of(_attr, \ #define to_rx_queue_attr(_attr) \
struct rx_queue_attribute, attr) container_of(_attr, struct rx_queue_attribute, attr)
#define to_rx_queue(obj) container_of(obj, struct netdev_rx_queue, kobj) #define to_rx_queue(obj) container_of(obj, struct netdev_rx_queue, kobj)
@ -736,9 +739,9 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
for_each_cpu_and(cpu, mask, cpu_online_mask) for_each_cpu_and(cpu, mask, cpu_online_mask)
map->cpus[i++] = cpu; map->cpus[i++] = cpu;
if (i) if (i) {
map->len = i; map->len = i;
else { } else {
kfree(map); kfree(map);
map = NULL; map = NULL;
} }
@ -827,8 +830,9 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,
table->mask = mask; table->mask = mask;
for (count = 0; count <= mask; count++) for (count = 0; count <= mask; count++)
table->flows[count].cpu = RPS_NO_CPU; table->flows[count].cpu = RPS_NO_CPU;
} else } else {
table = NULL; table = NULL;
}
spin_lock(&rps_dev_flow_lock); spin_lock(&rps_dev_flow_lock);
old_table = rcu_dereference_protected(queue->rps_flow_table, old_table = rcu_dereference_protected(queue->rps_flow_table,
@ -865,7 +869,6 @@ static void rx_queue_release(struct kobject *kobj)
struct rps_map *map; struct rps_map *map;
struct rps_dev_flow_table *flow_table; struct rps_dev_flow_table *flow_table;
map = rcu_dereference_protected(queue->rps_map, 1); map = rcu_dereference_protected(queue->rps_map, 1);
if (map) { if (map) {
RCU_INIT_POINTER(queue->rps_map, NULL); RCU_INIT_POINTER(queue->rps_map, NULL);
@ -974,8 +977,8 @@ struct netdev_queue_attribute {
ssize_t (*store)(struct netdev_queue *queue, ssize_t (*store)(struct netdev_queue *queue,
const char *buf, size_t len); const char *buf, size_t len);
}; };
#define to_netdev_queue_attr(_attr) container_of(_attr, \ #define to_netdev_queue_attr(_attr) \
struct netdev_queue_attribute, attr) container_of(_attr, struct netdev_queue_attribute, attr)
#define to_netdev_queue(obj) container_of(obj, struct netdev_queue, kobj) #define to_netdev_queue(obj) container_of(obj, struct netdev_queue, kobj)
@ -1104,9 +1107,9 @@ static ssize_t bql_set(const char *buf, const size_t count,
unsigned int value; unsigned int value;
int err; int err;
if (!strcmp(buf, "max") || !strcmp(buf, "max\n")) if (!strcmp(buf, "max") || !strcmp(buf, "max\n")) {
value = DQL_MAX_LIMIT; value = DQL_MAX_LIMIT;
else { } else {
err = kstrtouint(buf, 10, &value); err = kstrtouint(buf, 10, &value);
if (err < 0) if (err < 0)
return err; return err;
@ -1467,7 +1470,8 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)
/* pass ifindex to uevent. /* pass ifindex to uevent.
* ifindex is useful as it won't change (interface name may change) * ifindex is useful as it won't change (interface name may change)
* and is what RtNetlink uses natively. */ * and is what RtNetlink uses natively.
*/
retval = add_uevent_var(env, "IFINDEX=%d", dev->ifindex); retval = add_uevent_var(env, "IFINDEX=%d", dev->ifindex);
exit: exit:
@ -1542,7 +1546,7 @@ EXPORT_SYMBOL(of_find_net_device_by_node);
*/ */
void netdev_unregister_kobject(struct net_device *ndev) void netdev_unregister_kobject(struct net_device *ndev)
{ {
struct device *dev = &(ndev->dev); struct device *dev = &ndev->dev;
if (!atomic_read(&dev_net(ndev)->count)) if (!atomic_read(&dev_net(ndev)->count))
dev_set_uevent_suppress(dev, 1); dev_set_uevent_suppress(dev, 1);
@ -1559,7 +1563,7 @@ void netdev_unregister_kobject(struct net_device *ndev)
/* Create sysfs entries for network device. */ /* Create sysfs entries for network device. */
int netdev_register_kobject(struct net_device *ndev) int netdev_register_kobject(struct net_device *ndev)
{ {
struct device *dev = &(ndev->dev); struct device *dev = &ndev->dev;
const struct attribute_group **groups = ndev->sysfs_groups; const struct attribute_group **groups = ndev->sysfs_groups;
int error = 0; int error = 0;