* [B.A.T.M.A.N.] Staging: batman-adv for 2.6.35
@ 2010-06-06 19:03 Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: return -EFAULT on copy_to_user errors Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 2/2] Staging: batman-adv: fix function prototype Sven Eckelmann
0 siblings, 2 replies; 3+ messages in thread
From: Sven Eckelmann @ 2010-06-06 19:03 UTC (permalink / raw)
To: gregkh, b.a.t.m.a.n
Hi,
here are some patches which fixes different bugs in 2.6.35. These patches
collide with patches you already have received for 2.6.36. I will resend those
patches with resolved merge problems.
Best regards,
Sven Eckelmann
drivers/staging/batman-adv/bat_sysfs.c | 24 ++++++++++++------------
drivers/staging/batman-adv/device.c | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
Dan Carpenter (1):
Staging: batman-adv: return -EFAULT on copy_to_user errors
Javier Martinez Canillas (1):
Staging: batman-adv: fix function prototype
^ permalink raw reply [flat|nested] 3+ messages in thread
* [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: return -EFAULT on copy_to_user errors
2010-06-06 19:03 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.35 Sven Eckelmann
@ 2010-06-06 19:03 ` Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 2/2] Staging: batman-adv: fix function prototype Sven Eckelmann
1 sibling, 0 replies; 3+ messages in thread
From: Sven Eckelmann @ 2010-06-06 19:03 UTC (permalink / raw)
To: gregkh, b.a.t.m.a.n; +Cc: Dan Carpenter
From: Dan Carpenter <error27@gmail.com>
copy_to_user() returns the number of bites remaining but we want to
return a negative error code here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
drivers/staging/batman-adv/device.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c
index 7eb6559..32204b5 100644
--- a/drivers/staging/batman-adv/device.c
+++ b/drivers/staging/batman-adv/device.c
@@ -196,7 +196,7 @@ ssize_t bat_device_read(struct file *file, char __user *buf, size_t count,
kfree(device_packet);
if (error)
- return error;
+ return -EFAULT;
return sizeof(struct icmp_packet);
}
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [B.A.T.M.A.N.] [PATCH 2/2] Staging: batman-adv: fix function prototype
2010-06-06 19:03 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.35 Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: return -EFAULT on copy_to_user errors Sven Eckelmann
@ 2010-06-06 19:03 ` Sven Eckelmann
1 sibling, 0 replies; 3+ messages in thread
From: Sven Eckelmann @ 2010-06-06 19:03 UTC (permalink / raw)
To: gregkh, b.a.t.m.a.n; +Cc: Javier Martinez Canillas
From: Javier Martinez Canillas <martinez.javier@gmail.com>
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: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
drivers/staging/batman-adv/bat_sysfs.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c
index e2c000b..212bc21 100644
--- a/drivers/staging/batman-adv/bat_sysfs.c
+++ b/drivers/staging/batman-adv/bat_sysfs.c
@@ -225,9 +225,9 @@ static struct bat_attribute *mesh_attrs[] = {
NULL,
};
-static ssize_t transtable_local_read(struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buff, loff_t off, size_t count)
+static ssize_t transtable_local_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buff, loff_t off, size_t count)
{
struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev);
@@ -235,9 +235,9 @@ static ssize_t transtable_local_read(struct kobject *kobj,
return hna_local_fill_buffer_text(net_dev, buff, count, off);
}
-static ssize_t transtable_global_read(struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buff, loff_t off, size_t count)
+static ssize_t transtable_global_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buff, loff_t off, size_t count)
{
struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev);
@@ -245,9 +245,9 @@ static ssize_t transtable_global_read(struct kobject *kobj,
return hna_global_fill_buffer_text(net_dev, buff, count, off);
}
-static ssize_t originators_read(struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buff, loff_t off, size_t count)
+static ssize_t originators_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buff, loff_t off, size_t count)
{
struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev);
@@ -255,9 +255,9 @@ static ssize_t originators_read(struct kobject *kobj,
return orig_fill_buffer_text(net_dev, buff, count, off);
}
-static ssize_t vis_data_read(struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buff, loff_t off, size_t count)
+static ssize_t vis_data_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buff, loff_t off, size_t count)
{
struct device *dev = to_dev(kobj->parent);
struct net_device *net_dev = to_net_dev(dev);
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-06 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-06 19:03 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.35 Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: return -EFAULT on copy_to_user errors Sven Eckelmann
2010-06-06 19:03 ` [B.A.T.M.A.N.] [PATCH 2/2] Staging: batman-adv: fix function prototype Sven Eckelmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).