[lkml]   [2003]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH] Fix socket.c compilation failure when CONFIG_NET=n
[I send this to Linus earlier and he ignored it; maybe you're the right

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.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>

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at
 \ /
  Last update: 2005-03-22 13:32    [W:0.029 / U:2.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site