Package: rt2400-source Version: 1.2.2+cvs20060620-1 Severity: important Tags: patch
The module will fail with the following error: make[1]: Entering directory `/home/kel/src/linux-2.6.17-kel-4' CC [M] /home/kel/src/modules/rt2400/rtmp_main.o /home/kel/src/modules/rt2400/rtmp_main.c:55: error: expected ‘)’ before string constant /home/kel/src/modules/rt2400/rtmp_main.c:59: error: expected ‘)’ before string constant make[2]: *** [/home/kel/src/modules/rt2400/rtmp_main.o] Error 1 make[1]: *** [_module_/home/kel/src/modules/rt2400] Error 2 make[1]: Leaving directory `/home/kel/src/linux-2.6.17-kel-4' rt2400.ko failed to build! make: *** [module] Error 1 This is due to the removal of the MODULE_PARM() macro's. Somehow, this stuff was lost in between 1.2.2-b2 and 1.2.2-b3 upstream, so I contacted them along with same patch as attached. Thanks, Kel. -- System Information: Debian Release: testing/unstable APT prefers experimental APT policy: (500, 'experimental'), (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.17-kel-4 Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Versions of packages rt2400-source depends on: ii debhelper 5.0.37.3 helper programs for debian/rules ii module-assistant 0.10.4 tool to make module package creati rt2400-source recommends no packages. -- no debconf information
diff -Nrup rt2400-1.2.2-b3/Module/rtmp_main.c rt2400-1.2.2-b3.patched/Module/rtmp_main.c --- rt2400-1.2.2-b3/Module/rtmp_main.c 2005-07-31 02:36:25.000000000 +1000 +++ rt2400-1.2.2-b3.patched/Module/rtmp_main.c 2006-07-21 15:52:37.000000000 +1000 @@ -52,11 +52,17 @@ // Global static variable, Debug level flag // Don't hide this behind debug define. There should be as little difference between debug and no-debug as possible. int debug = 0; /* Default is off. */ -MODULE_PARM(debug, "i"); -MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off."); - static char *ifname = NULL; + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) +MODULE_PARM(debug, "i"); MODULE_PARM(ifname, "s"); +#else +module_param(debug, int, 0); +module_param(ifname, charp, 0); +#endif + +MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off."); MODULE_PARM_DESC(ifname, "Network device name (default ra%d)"); // The driver version information
