]> err.no Git - linux-2.6/commitdiff
[PATCH] ndiswrapper: don't set the module->taints flags
authorRandy Dunlap <randy.dunlap@oracle.com>
Mon, 30 Oct 2006 06:46:34 +0000 (22:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 30 Oct 2006 20:08:40 +0000 (12:08 -0800)
For ndiswrapper, don't set the module->taints flags, just set the kernel
global tainted flag.  This should allow ndiswrapper to continue to use GPL
symbols.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Florin Malita <fmalita@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/module.c

index 5072a943fe3571eb0465aea4418348e55f46549d..f0166563c602f12aba2867b60965959bfb57f6a7 100644 (file)
@@ -1718,7 +1718,7 @@ static struct module *load_module(void __user *umod,
        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);