[PATCH] compile error in ieee80211_ioctl.c

[Alex Davis]

Hello:

I sent this patch earlier and got no response, so I'm sending it again.


I cloned git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
last night and got compile errors while compiling net/d80211/ieee80211_ioctl.c
into a module:

  CC [M]  net/d80211/ieee80211_ioctl.o
net/d80211/ieee80211_ioctl.c:33: error: syntax error before string constant
net/d80211/ieee80211_ioctl.c:33: warning: type defaults to `int' in declaration of `MODULE_PARM'
net/d80211/ieee80211_ioctl.c:33: warning: function declaration isn't a prototype
net/d80211/ieee80211_ioctl.c:33: warning: data definition has no type or storage class
net/d80211/ieee80211_ioctl.c:43: error: syntax error before string constant
net/d80211/ieee80211_ioctl.c:43: warning: type defaults to `int' in declaration of `MODULE_PARM'
net/d80211/ieee80211_ioctl.c:43: warning: function declaration isn't a prototype
net/d80211/ieee80211_ioctl.c:43: warning: data definition has no type or storage class
make[2]: *** [net/d80211/ieee80211_ioctl.o] Error 1
make[1]: *** [net/d80211] Error 2
make: *** [net] Error 2

This patch fixes it.

Signed-off-by: Alex Davis <alex14641@xxxxxxxxx>

diff --git a/net/d80211/ieee80211_ioctl.c b/net/d80211/ieee80211_ioctl.c
index 42a7abe..4949e52 100644
--- a/net/d80211/ieee80211_ioctl.c
+++ b/net/d80211/ieee80211_ioctl.c
@@ -30,7 +30,7 @@ #include "aes_ccm.h"
 
 
 static int ieee80211_regdom = 0x10; /* FCC */
-MODULE_PARM(ieee80211_regdom, "i");
+module_param(ieee80211_regdom, int, 0x10);
 MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain; 64=MKK");
 
 /*
@@ -40,7 +40,7 @@ MODULE_PARM_DESC(ieee80211_regdom, "IEEE
  * module.
  */
 static int ieee80211_japan_5ghz /* = 0 */;
-MODULE_PARM(ieee80211_japan_5ghz, "i");
+module_param(ieee80211_japan_5ghz, int, 0);
 MODULE_PARM_DESC(ieee80211_japan_5ghz, "Vendor-updated firmware for 5 GHz");

I code, therefore I am

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/