diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bridge/br_sysfs_br.c | 8 | ||||
-rw-r--r-- | net/bridge/br_sysfs_if.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 33c6c4a7c689..4f42263e0a8a 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c | |||
@@ -360,8 +360,9 @@ static struct attribute_group bridge_group = { | |||
360 | * | 360 | * |
361 | * Returns the number of bytes read. | 361 | * Returns the number of bytes read. |
362 | */ | 362 | */ |
363 | static ssize_t brforward_read(struct kobject *kobj, char *buf, | 363 | static ssize_t brforward_read(struct kobject *kobj, |
364 | loff_t off, size_t count) | 364 | struct bin_attribute *bin_attr, |
365 | char *buf, loff_t off, size_t count) | ||
365 | { | 366 | { |
366 | struct device *dev = to_dev(kobj); | 367 | struct device *dev = to_dev(kobj); |
367 | struct net_bridge *br = to_bridge(dev); | 368 | struct net_bridge *br = to_bridge(dev); |
@@ -383,8 +384,7 @@ static ssize_t brforward_read(struct kobject *kobj, char *buf, | |||
383 | 384 | ||
384 | static struct bin_attribute bridge_forward = { | 385 | static struct bin_attribute bridge_forward = { |
385 | .attr = { .name = SYSFS_BRIDGE_FDB, | 386 | .attr = { .name = SYSFS_BRIDGE_FDB, |
386 | .mode = S_IRUGO, | 387 | .mode = S_IRUGO, }, |
387 | .owner = THIS_MODULE, }, | ||
388 | .read = brforward_read, | 388 | .read = brforward_read, |
389 | }; | 389 | }; |
390 | 390 | ||
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 2da22927d8dd..79db51fcb476 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c | |||
@@ -29,8 +29,7 @@ struct brport_attribute { | |||
29 | #define BRPORT_ATTR(_name,_mode,_show,_store) \ | 29 | #define BRPORT_ATTR(_name,_mode,_show,_store) \ |
30 | struct brport_attribute brport_attr_##_name = { \ | 30 | struct brport_attribute brport_attr_##_name = { \ |
31 | .attr = {.name = __stringify(_name), \ | 31 | .attr = {.name = __stringify(_name), \ |
32 | .mode = _mode, \ | 32 | .mode = _mode }, \ |
33 | .owner = THIS_MODULE, }, \ | ||
34 | .show = _show, \ | 33 | .show = _show, \ |
35 | .store = _store, \ | 34 | .store = _store, \ |
36 | }; | 35 | }; |