Commit eb169d1c authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman

Staging: batman-adv: fix function prototype

In today linux-next I got a compile warning in staging/batman-adv.

This is due a struct bin_attribute read function prototype change and the driver was not updated.

This patch solves the issue
Signed-off-by: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 25477f23
...@@ -225,9 +225,9 @@ static struct bat_attribute *mesh_attrs[] = { ...@@ -225,9 +225,9 @@ static struct bat_attribute *mesh_attrs[] = {
NULL, NULL,
}; };
static ssize_t transtable_local_read(struct kobject *kobj, static ssize_t transtable_local_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buff, loff_t off, size_t count) char *buff, loff_t off, size_t count)
{ {
struct device *dev = to_dev(kobj->parent); struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev); struct net_device *net_dev = to_net_dev(dev);
...@@ -235,9 +235,9 @@ static ssize_t transtable_local_read(struct kobject *kobj, ...@@ -235,9 +235,9 @@ static ssize_t transtable_local_read(struct kobject *kobj,
return hna_local_fill_buffer_text(net_dev, buff, count, off); return hna_local_fill_buffer_text(net_dev, buff, count, off);
} }
static ssize_t transtable_global_read(struct kobject *kobj, static ssize_t transtable_global_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buff, loff_t off, size_t count) char *buff, loff_t off, size_t count)
{ {
struct device *dev = to_dev(kobj->parent); struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev); struct net_device *net_dev = to_net_dev(dev);
...@@ -245,9 +245,9 @@ static ssize_t transtable_global_read(struct kobject *kobj, ...@@ -245,9 +245,9 @@ static ssize_t transtable_global_read(struct kobject *kobj,
return hna_global_fill_buffer_text(net_dev, buff, count, off); return hna_global_fill_buffer_text(net_dev, buff, count, off);
} }
static ssize_t originators_read(struct kobject *kobj, static ssize_t originators_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buff, loff_t off, size_t count) char *buff, loff_t off, size_t count)
{ {
struct device *dev = to_dev(kobj->parent); struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev); struct net_device *net_dev = to_net_dev(dev);
...@@ -255,9 +255,9 @@ static ssize_t originators_read(struct kobject *kobj, ...@@ -255,9 +255,9 @@ static ssize_t originators_read(struct kobject *kobj,
return orig_fill_buffer_text(net_dev, buff, count, off); return orig_fill_buffer_text(net_dev, buff, count, off);
} }
static ssize_t vis_data_read(struct kobject *kobj, static ssize_t vis_data_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buff, loff_t off, size_t count) char *buff, loff_t off, size_t count)
{ {
struct device *dev = to_dev(kobj->parent); struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev); struct net_device *net_dev = to_net_dev(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment