From patchwork Sat Jan 24 15:32:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 20167 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 2B41B474C4 for ; Sun, 25 Jan 2009 02:33:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751487AbZAXPdA (ORCPT ); Sat, 24 Jan 2009 10:33:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750947AbZAXPdA (ORCPT ); Sat, 24 Jan 2009 10:33:00 -0500 Received: from khc.piap.pl ([195.187.100.11]:45287 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbZAXPc7 convert rfc822-to-8bit (ORCPT ); Sat, 24 Jan 2009 10:32:59 -0500 Received: from intrepid.localdomain (intrepid.localdomain [10.0.0.2]) by khc.piap.pl (Postfix) with ESMTP id 533F74F679; Sat, 24 Jan 2009 16:32:55 +0100 (CET) To: Jaswinder Singh Rajput Cc: David Miller , shemminger@vyatta.com, sam@ravnborg.org, jaswinderlinux@gmail.com, arnd@arndb.de, mingo@elte.hu, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: why usr/include/linux/if_frad.h is required References: <20090121053310.GA26395@uranus.ravnborg.org> <20090120.221504.264090722.davem@davemloft.net> <20090121173838.3390e5c9@s6510> <20090121.153712.84781438.davem@davemloft.net> <1232803533.17900.4.camel@localhost.localdomain> From: Krzysztof Halasa Date: Sat, 24 Jan 2009 16:32:55 +0100 In-Reply-To: <1232803533.17900.4.camel@localhost.localdomain> (Jaswinder Singh Rajput's message of "Sat\, 24 Jan 2009 18\:55\:33 +0530") Message-ID: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jaswinder Singh Rajput writes: > After killing CONFIG_DLCI and CONFIG_DLCI_MODULE, it is also killing the > kernel: > > CC net/socket.o > In file included from net/socket.c:75: > include/linux/if_frad.h:170: error: ‘CONFIG_DLCI_MAX’ undeclared here (not in a function) Perhaps this would do (untested). Signed-off-by: Krzysztof Hałasa --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 5c34240..60e16a5 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h @@ -26,8 +26,6 @@ #include -#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) - /* Structures and constants associated with the DLCI device driver */ struct dlci_add @@ -127,6 +125,8 @@ struct frad_conf #ifdef __KERNEL__ +#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) + /* these are the fields of an RFC 1490 header */ struct frhdr { @@ -190,12 +190,10 @@ struct frad_local int buffer; /* current buffer for S508 firmware */ }; -#endif /* __KERNEL__ */ - #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */ -#ifdef __KERNEL__ extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)); -#endif + +#endif /* __KERNEL__ */ #endif