Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S267318AbTAGGck>; Tue, 7 Jan 2003 01:32:40 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S267317AbTAGGck>; Tue, 7 Jan 2003 01:32:40 -0500
Received: from TYO202.gate.nec.co.jp ([202.32.8.202]:23697 "EHLO
	TYO202.gate.nec.co.jp") by vger.kernel.org with ESMTP
	id <S267318AbTAGGcj>; Tue, 7 Jan 2003 01:32:39 -0500
To: jt@hpl.hp.com
Subject: [PATCH]  Fix socket.c compilation failure when CONFIG_NET=n
Cc: linux-kernel@vger.kernel.org
Reply-To: Miles Bader <miles@gnu.org>
Message-Id: <20030107064107.C19A73745@mcspd15.ucom.lsi.nec.co.jp>
Date: Tue,  7 Jan 2003 15:41:07 +0900 (JST)
From: miles@lsi.nec.co.jp (Miles Bader)
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1250
Lines: 32

[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>
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/