From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759627AbYGaAEn (ORCPT ); Wed, 30 Jul 2008 20:04:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754313AbYGaAE3 (ORCPT ); Wed, 30 Jul 2008 20:04:29 -0400 Received: from ns.suse.de ([195.135.220.2]:37708 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbYGaAE2 (ORCPT ); Wed, 30 Jul 2008 20:04:28 -0400 Date: Wed, 30 Jul 2008 16:57:52 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "David S. Miller" Subject: [patch 04/62] ipv6: __KERNEL__ ifdef struct ipv6_devconf Message-ID: <20080730235752.GD12896@suse.de> References: <20080730233050.332789722@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="ipv6-__kernel__-ifdef-struct-ipv6_devconf.patch" In-Reply-To: <20080730234915.GA12426@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.26 -stable review patch. If anyone has any objections, please let us know. ------------------ From: David S. Miller [ Upstream commit ebb36a978131810c98e7198b1187090c697cf99f ] Based upon a report by Olaf Hering. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/linux/ipv6.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -123,6 +123,7 @@ struct ipv6hdr { struct in6_addr daddr; }; +#ifdef __KERNEL__ /* * This structure contains configuration options per IPv6 link. */ @@ -165,6 +166,7 @@ struct ipv6_devconf { #endif void *sysctl; }; +#endif /* index values for the variables in ipv6_devconf */ enum { --