diff mbox

[2/2] batman-adv: adding sysfs compat

Message ID 1272846518-2589-2-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Marek Lindner May 3, 2010, 12:28 a.m. UTC 
  The linux sysfs layer changed with 2.6.25 which breaks batman-adv
on older versions. This patch adds a compat layer for the affected
function calls.

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 batman-adv-kernelland/bat_sysfs.c |    1 +
 batman-adv-kernelland/compat.h    |   70 +++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 0 deletions(-)
diff mbox

Patch

diff --git a/batman-adv-kernelland/bat_sysfs.c b/batman-adv-kernelland/bat_sysfs.c
index c700359..7690368 100644
--- a/batman-adv-kernelland/bat_sysfs.c
+++ b/batman-adv-kernelland/bat_sysfs.c
@@ -27,6 +27,7 @@ 
 #include "gateway_common.h"
 #include "gateway_client.h"
 #include "vis.h"
+#include "compat.h"
 
 #define to_dev(obj)     container_of(obj, struct device, kobj)
 
diff --git a/batman-adv-kernelland/compat.h b/batman-adv-kernelland/compat.h
index 4eaa128..9f21f5a 100644
--- a/batman-adv-kernelland/compat.h
+++ b/batman-adv-kernelland/compat.h
@@ -23,6 +23,7 @@ 
  */
 
 #include <linux/version.h>	/* LINUX_VERSION_CODE */
+#include "bat_sysfs.h"		/* struct bat_attribute */
 
 #ifndef IPPROTO_UDP
 #define IPPROTO_UDP 17
@@ -80,6 +81,75 @@  static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len)
 	ret; \
 })
 
+#define transtable_local_read(kobj, attr, buff, off, count) \
+	transtable_local_read(kobj, buff, off, count)
+#define transtable_global_read(kobj, attr, buff, off, count) \
+	transtable_global_read(kobj, buff, off, count)
+#define originators_read(kobj, attr, buff, off, count) \
+	originators_read(kobj, buff, off, count)
+#define gateways_read(kobj, attr, buff, off, count) \
+	gateways_read(kobj, buff, off, count)
+#define vis_data_read(kobj, attr, buff, off, count) \
+	vis_data_read(kobj, buff, off, count)
+
+#define to_battr(a) container_of(a, struct bat_attribute, attr)
+
+static inline ssize_t bat_wrapper_show(struct kobject *kobj,
+				   struct attribute *attr, char *buf)
+{
+	struct bat_attribute *bat_attr = to_battr(attr);
+
+	if (bat_attr->show)
+		return bat_attr->show(kobj, attr, buf);
+
+	return -EIO;
+}
+
+static inline ssize_t bat_wrapper_store(struct kobject *kobj,
+				    struct attribute *attr,
+				    const char *buf, size_t count)
+{
+	struct bat_attribute *bat_attr = to_battr(attr);
+
+	if (bat_attr->store)
+		return bat_attr->store(kobj, attr, (char *)buf, count);
+
+	return -EIO;
+}
+
+static struct sysfs_ops bat_wrapper_ops = {
+	.show   = bat_wrapper_show,
+	.store  = bat_wrapper_store,
+};
+
+static struct kobj_type ktype_bat_wrapper = {
+	.sysfs_ops      = &bat_wrapper_ops,
+};
+
+static inline struct kobject *kobject_create_and_add(const char *name,
+						     struct kobject *parent)
+{
+	struct kobject *kobj;
+	int err;
+
+	kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);
+	if (!kobj)
+		return NULL;
+
+	kobject_set_name(kobj, name);
+	kobj->ktype = &ktype_bat_wrapper;
+	kobj->kset = NULL;
+	kobj->parent = parent;
+
+	err = kobject_register(kobj);
+	if (err) {
+		kobject_put(kobj);
+		return NULL;
+	}
+
+	return kobj;
+}
+
 #endif /* < KERNEL_VERSION(2, 6, 25) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)