From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Sat, 10 Dec 2011 23:02:39 +0000 (-0200)
Subject: insmod: allows providing option to module.
X-Git-Tag: v1~55^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a721bbcf02217e11b214a479f15529669d05339;p=thirdparty%2Fkmod.git

insmod: allows providing option to module.
---

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index ca25bc74..96be0cb1 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -518,13 +518,14 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod,
 extern long init_module(void *mem, unsigned long len, const char *args);
 
 KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
-							unsigned int flags)
+							unsigned int flags,
+							const char *options)
 {
 	int err;
 	void *mmaped_file;
 	struct stat st;
 	int fd;
-	const char *args = "";
+	const char *args = options ? options : "";
 
 	if (mod == NULL)
 		return -ENOENT;
diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h
index a7fc7764..130c703b 100644
--- a/libkmod/libkmod.h
+++ b/libkmod/libkmod.h
@@ -102,7 +102,7 @@ struct kmod_list *kmod_module_get_dependencies(const struct kmod_module *mod);
 int kmod_module_get_filtered_blacklist(const struct kmod_ctx *ctx, const struct kmod_list *input, struct kmod_list **output);
 
 int kmod_module_remove_module(struct kmod_module *mod, unsigned int flags);
-int kmod_module_insert_module(struct kmod_module *mod, unsigned int flags);
+int kmod_module_insert_module(struct kmod_module *mod, unsigned int flags, const char *options);
 
 const char *kmod_module_get_name(const struct kmod_module *mod);
 const char *kmod_module_get_path(const struct kmod_module *mod);
diff --git a/test/test-insmod.c b/test/test-insmod.c
index aeb735ab..6deaf77e 100644
--- a/test/test-insmod.c
+++ b/test/test-insmod.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
 
 	printf("Trying insmod '%s' (%s)\n", kmod_module_get_name(mod),
 						kmod_module_get_path(mod));
-	err = kmod_module_insert_module(mod, 0);
+	err = kmod_module_insert_module(mod, 0, NULL);
 	if (err < 0) {
 		fprintf(stderr, "%s\n", strerror(-err));