Andrew Morton wrote:On Fri, 27 Oct 2006 08:27:41 -0700
Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote:
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>Could someone please test this for us?
---
kernel/module.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- linux-2619-rc3-pv.orig/kernel/module.c
+++ linux-2619-rc3-pv/kernel/module.c
@@ -1718,7 +1718,7 @@ static struct module *load_module(void _
set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
if (strcmp(mod->name, "ndiswrapper") == 0)
- add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+ add_taint(TAINT_PROPRIETARY_MODULE);
if (strcmp(mod->name, "driverloader") == 0)
add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
Tested, works (ndiswrapper 1.27).
Also, since driverloader is not GPL-compatible (MODULE_LICENSE("see
LICENSE file; Copyright (c)2003-2004 Linuxant inc.")), that check is
redundant. How about removing it (applies on top of Randy's patch)?
Signed-off-by: Florin Malita <fmalita@xxxxxxxxx>
---
module.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c
index 67009bd..293eb4c 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1719,8 +1719,6 @@ #endif
if (strcmp(mod->name, "ndiswrapper") == 0)
add_taint(TAINT_PROPRIETARY_MODULE);
- if (strcmp(mod->name, "driverloader") == 0)
- add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
/* Set up MODINFO_ATTR fields */
setup_modinfo(mod, sechdrs, infoindex);