* [PATCH] Fix socket.c compilation failure when CONFIG_NET=n
@ 2003-01-07 6:41 Miles Bader
2003-01-09 18:06 ` Jean Tourrilhes
0 siblings, 1 reply; 3+ messages in thread
From: Miles Bader @ 2003-01-07 6:41 UTC (permalink / raw)
To: jt; +Cc: linux-kernel
[I send this to Linus earlier and he ignored it; maybe you're the right
person...]
In net/socket.c, <linux/wireless.h> is included twice, once conditionally
(on CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO) and once unconditionally.
However, including <linux/wireless.h> defines WIRELESS_EXT, and this causes an
#ifdef in `sock_ioctl' to reference `dev_ioctl', which isn't defined when
CONFIG_NET=n, and so results in an unresolved symbol reference in that case.
The following patch fixes this by removing the unconditional include, and only
keeping the conditional one.
Thanks,
-Miles
diff -ruN -X../cludes linux-2.5.54-moo.orig/net/socket.c linux-2.5.54-moo/net/socket.c
--- linux-2.5.54-moo.orig/net/socket.c 2002-11-25 10:30:11.000000000 +0900
+++ linux-2.5.54-moo/net/socket.c 2003-01-06 13:27:17.000000000 +0900
@@ -75,7 +75,6 @@
#include <linux/cache.h>
#include <linux/module.h>
#include <linux/highmem.h>
-#include <linux/wireless.h>
#include <linux/divert.h>
#include <linux/mount.h>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix socket.c compilation failure when CONFIG_NET=n
2003-01-07 6:41 [PATCH] Fix socket.c compilation failure when CONFIG_NET=n Miles Bader
@ 2003-01-09 18:06 ` Jean Tourrilhes
0 siblings, 0 replies; 3+ messages in thread
From: Jean Tourrilhes @ 2003-01-09 18:06 UTC (permalink / raw)
To: Miles Bader; +Cc: linux-kernel
On Tue, Jan 07, 2003 at 03:41:07PM +0900, Miles Bader wrote:
> [I send this to Linus earlier and he ignored it; maybe you're the right
> person...]
>
> In net/socket.c, <linux/wireless.h> is included twice, once conditionally
> (on CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO) and once unconditionally.
> However, including <linux/wireless.h> defines WIRELESS_EXT, and this causes an
> #ifdef in `sock_ioctl' to reference `dev_ioctl', which isn't defined when
> CONFIG_NET=n, and so results in an unresolved symbol reference in that case.
>
> The following patch fixes this by removing the unconditional include, and only
> keeping the conditional one.
>
> Thanks,
>
> -Miles
>
> diff -ruN -X../cludes linux-2.5.54-moo.orig/net/socket.c linux-2.5.54-moo/net/socket.c
> --- linux-2.5.54-moo.orig/net/socket.c 2002-11-25 10:30:11.000000000 +0900
> +++ linux-2.5.54-moo/net/socket.c 2003-01-06 13:27:17.000000000 +0900
> @@ -75,7 +75,6 @@
> #include <linux/cache.h>
> #include <linux/module.h>
> #include <linux/highmem.h>
> -#include <linux/wireless.h>
> #include <linux/divert.h>
> #include <linux/mount.h>
This was included in 2.5.55, so I guess Linus didn't ignored you.
Regards,
Jean
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] Fix socket.c compilation failure when CONFIG_NET=n
@ 2002-12-26 3:21 Miles Bader
0 siblings, 0 replies; 3+ messages in thread
From: Miles Bader @ 2002-12-26 3:21 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
In net/socket.c, <linux/wireless.h> is included twice, once conditionally
(on CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO) and once unconditionally.
However, including <linux/wireless.h> defines WIRELESS_EXT, and this causes an
#ifdef in `sock_ioctl' to reference `dev_ioctl', which isn't defined when
CONFIG_NET=n, and so results in an unresolved symbol reference in that case.
The following patch fixes this by removing the unconditional include, and only
keeping the conditional one.
diff -ruN -X../cludes linux-2.5.53-moo.orig/net/socket.c linux-2.5.53-moo/net/socket.c
--- linux-2.5.53-moo.orig/net/socket.c 2002-11-25 10:30:11.000000000 +0900
+++ linux-2.5.53-moo/net/socket.c 2002-12-26 11:43:49.000000000 +0900
@@ -75,7 +75,6 @@
#include <linux/cache.h>
#include <linux/module.h>
#include <linux/highmem.h>
-#include <linux/wireless.h>
#include <linux/divert.h>
#include <linux/mount.h>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-01-09 17:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-01-07 6:41 [PATCH] Fix socket.c compilation failure when CONFIG_NET=n Miles Bader
2003-01-09 18:06 ` Jean Tourrilhes
-- strict thread matches above, loose matches on Subject: below --
2002-12-26 3:21 Miles Bader
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.