diff mbox

[v2,3/4] batman-adv: allowing changing the routing algorithm via module parameter

Message ID 1323537357-9116-4-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit 3b94747c96c7b78f01f34d090344aa446a5f56f7
Headers

Commit Message

Marek Lindner Dec. 10, 2011, 5:15 p.m. UTC 
  Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 compat.h |   28 ++++++++++++++++++++++++++++
 main.c   |   24 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)

Comments

Marek Lindner Dec. 22, 2011, 12:24 p.m. UTC | #1 
On Sunday, December 11, 2011 01:15:56 Marek Lindner wrote:
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  compat.h |   28 ++++++++++++++++++++++++++++
>  main.c   |   24 ++++++++++++++++++++++++
>  2 files changed, 52 insertions(+), 0 deletions(-)

Applied in revision 3b94747.

Regards,
Marek
diff mbox

Patch

diff --git a/compat.h b/compat.h
index 194e70e..3733f68 100644
--- a/compat.h
+++ b/compat.h
@@ -61,6 +61,34 @@ 
 #define __rcu
 #define IFF_BRIDGE_PORT  0 || (hard_iface->net_dev->br_port ? 1 : 0)
 
+struct kernel_param_ops {
+	/* Returns 0, or -errno.  arg is in kp->arg. */
+	int (*set)(const char *val, const struct kernel_param *kp);
+	/* Returns length written or -errno.  Buffer is 4k (ie. be short!) */
+	int (*get)(char *buffer, struct kernel_param *kp);
+	/* Optional function to free kp->arg when module unloaded. */
+	void (*free)(void *arg);
+};
+
+#define module_param_cb(name, ops, arg, perm)				\
+	static int __compat_set_param_##name(const char *val,		\
+					     struct kernel_param *kp)	\
+				{ return (ops)->set(val, kp); }		\
+	static int __compat_get_param_##name(char *buffer,		\
+					     struct kernel_param *kp)	\
+				{ return (ops)->get(buffer, kp); }	\
+	__module_param_call(MODULE_PARAM_PREFIX, name,			\
+			    __compat_set_param_##name,			\
+			    __compat_get_param_##name, arg,		\
+			    __same_type((arg), bool *), perm)
+
+static inline int __param_set_copystring(const char *val,
+					 const struct kernel_param *kp)
+{
+	return param_set_copystring(val, (struct kernel_param *)kp);
+}
+#define param_set_copystring __param_set_copystring
+
 #endif /* < KERNEL_VERSION(2, 6, 36) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
diff --git a/main.c b/main.c
index bcc2bdd..8ae497b 100644
--- a/main.c
+++ b/main.c
@@ -256,6 +256,30 @@  int bat_algo_seq_print_text(struct seq_file *seq, void *offset)
 	return 0;
 }
 
+static int param_set_ra(const char *val, const struct kernel_param *kp)
+{
+	struct bat_algo_ops *bat_algo_ops;
+
+	bat_algo_ops = bat_algo_get((char *)val);
+	if (!bat_algo_ops) {
+		pr_err("Routing algorithm '%s' is not supported\n", val);
+		return -EINVAL;
+	}
+
+	return param_set_copystring(val, kp);
+}
+
+static const struct kernel_param_ops param_ops_ra = {
+	.set = param_set_ra,
+	.get = param_get_string,
+};
+
+static struct kparam_string __param_string_ra = {
+	.maxlen = sizeof(bat_routing_algo),
+	.string = bat_routing_algo,
+};
+
+module_param_cb(routing_algo, &param_ops_ra, &__param_string_ra, 0644);
 module_init(batman_init);
 module_exit(batman_exit);