From: John Crispin <blogic@openwrt.org>
Date: Fri, 8 Nov 2013 21:59:58 +0000 (+0100)
Subject: kmod-loader: fix module options support when using modprobe
X-Git-Url: http://git.openwrt.org/?p=project%2Fubox.git;a=commitdiff_plain;h=2fdd374f4214129d93f10b7001adece9239752a2

kmod-loader: fix module options support when using modprobe

Signed-off-by: John Crispin <blogic@openwrt.org>
---

diff --git a/kmodloader.c b/kmodloader.c
index 11af0ae..3238190 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -55,6 +55,7 @@ struct module {
 
 	char *name;
 	char *depends;
+	char *options;
 
 	int size;
 	int usage;
@@ -455,7 +456,7 @@ static int load_modprobe(void)
 		todo = 0;
 		avl_for_each_element(&modules, m, avl) {
 			if ((m->state == PROBE) && (!deps_available(m, 0))) {
-				if (!insert_module(get_module_path(m->name), "")) {
+				if (!insert_module(get_module_path(m->name), m->options)) {
 					m->state = LOADED;
 					m->error = 0;
 					loaded++;
@@ -709,6 +710,7 @@ static int main_loader(int argc, char **argv)
 			if (!m || (m->state == LOADED))
 				continue;
 
+			m->options = opts;
 			m->state = PROBE;
 			if (basename(gl.gl_pathv[j])[0] - '0' <= 9)
 				load_modprobe();