39 lines
1012 B
Diff
39 lines
1012 B
Diff
|
diff -Nru kmod-13.orig/libkmod/libkmod-module.c kmod-13/libkmod/libkmod-module.c
|
||
|
|
--- kmod-13.orig/libkmod/libkmod-module.c 2013-04-26 18:23:58.080751735 +0200
|
||
|
|
+++ kmod-13/libkmod/libkmod-module.c 2013-04-26 18:24:44.050393418 +0200
|
||
|
|
@@ -808,19 +808,6 @@
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (kmod_file_get_direct(file)) {
|
||
|
|
- unsigned int kernel_flags = 0;
|
||
|
|
-
|
||
|
|
- if (flags & KMOD_INSERT_FORCE_VERMAGIC)
|
||
|
|
- kernel_flags |= MODULE_INIT_IGNORE_VERMAGIC;
|
||
|
|
- if (flags & KMOD_INSERT_FORCE_MODVERSION)
|
||
|
|
- kernel_flags |= MODULE_INIT_IGNORE_MODVERSIONS;
|
||
|
|
-
|
||
|
|
- err = finit_module(kmod_file_get_fd(file), args, kernel_flags);
|
||
|
|
- if (err == 0 || errno != ENOSYS)
|
||
|
|
- goto init_finished;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
size = kmod_file_get_size(file);
|
||
|
|
mem = kmod_file_get_contents(file);
|
||
|
|
|
||
|
|
@@ -847,14 +834,6 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
err = init_module(mem, size, args);
|
||
|
|
-init_finished:
|
||
|
|
- if (err < 0) {
|
||
|
|
- err = -errno;
|
||
|
|
- INFO(mod->ctx, "Failed to insert module '%s': %m\n", path);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- if (elf != NULL)
|
||
|
|
- kmod_elf_unref(elf);
|
||
|
|
elf_failed:
|
||
|
|
kmod_file_unref(file);
|
||
|
|
|