[linux-next] LinuxNextTracking branch, master, updated. next-20120220

batman at open-mesh.org batman at open-mesh.org
Tue Feb 21 00:16:42 CET 2012


The following commit has been merged in the master branch:
commit d419be1fd1e4417adc833365a3b69d0968c27c3f
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Sat Dec 10 19:45:53 2011 +0800

    batman-adv: allowing changing the routing algorithm via module parameter
    
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index bcc2bdd..8ae497b 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/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);
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list