From patchwork Wed Sep 22 15:54:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ollie Wild X-Patchwork-Id: 65433 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.180.67]) by ozlabs.org (Postfix) with ESMTP id AFA3DB70DE for ; Thu, 23 Sep 2010 01:55:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218Ab0IVPy7 (ORCPT ); Wed, 22 Sep 2010 11:54:59 -0400 Received: from smtp-out.google.com ([74.125.121.35]:30773 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298Ab0IVPy6 (ORCPT ); Wed, 22 Sep 2010 11:54:58 -0400 Received: from wpaz5.hot.corp.google.com (wpaz5.hot.corp.google.com [172.24.198.69]) by smtp-out.google.com with ESMTP id o8MFstAY026329 for ; Wed, 22 Sep 2010 08:54:56 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1285170896; bh=QoujaiQjVlji9gGzTSnEwDXfO1k=; h=MIME-Version:In-Reply-To:References:Date:Message-ID:Subject:From: To:Cc:Content-Type; b=KTSb2kHcszfiEKVM7Gj8WsI7PkIU+vu8kvh9WvJBNS4NfA5hKExrN+f32JyVxy1Fw 3EVm6emi4L2CGnn+AR6ww== Received: from pvc21 (pvc21.prod.google.com [10.241.209.149]) by wpaz5.hot.corp.google.com with ESMTP id o8MFruGV015176 for ; Wed, 22 Sep 2010 08:54:54 -0700 Received: by pvc21 with SMTP id 21so221341pvc.13 for ; Wed, 22 Sep 2010 08:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=beta; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=KF+ikU9WKTPtmZiWcePJv4psBYjhrD6dd6BX7T0FZDQ=; b=X8totr9OrHN7oKBVbfLYCZ0CWpY+s0Dj+uwr331714xenFykwL2jSCtzerNxtoKixe AL4p7ggk4iRxrDzGvwPQ== DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=dGZMszjBdrdzY3/V/nnWhsMEKAXHtedvTkSlyjI42iDavAc4S0sS/ABcQh4oNj+gw5 C8dFwmXhuRmcdz6BfI+Q== MIME-Version: 1.0 Received: by 10.142.232.19 with SMTP id e19mr305101wfh.254.1285170894281; Wed, 22 Sep 2010 08:54:54 -0700 (PDT) Received: by 10.142.52.5 with HTTP; Wed, 22 Sep 2010 08:54:54 -0700 (PDT) In-Reply-To: <20100917.165120.139548355.davem@davemloft.net> References: <20100917.165120.139548355.davem@davemloft.net> Date: Wed, 22 Sep 2010 10:54:54 -0500 Message-ID: Subject: Re: [PATCH] Move "struct net" declaration inside the __KERNEL__ macro guard From: Ollie Wild To: David Miller Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, akpm@linux-foundation.org, davem@google.com X-System-Of-Record: true Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, Sep 17, 2010 at 6:51 PM, David Miller wrote: > > From: Ollie Wild > Date: Fri, 17 Sep 2010 14:38:59 -0500 > > > (Resending with a proper signoff.) > > Your patch is still unusable because your email client white-space mangled > the patch, turning tabs into space characters. > > Please fix this up and resubmit, thanks. Third time's a charm ... Signed-off-by: Ollie Wild commit 27fb1ec3fe29978ca7f195aac5dbda6f301c7c24 Author: Ollie Wild Date: Fri Aug 13 14:21:44 2010 -0500 Move "struct net" declaration inside the __KERNEL__ macro guard. This patch reduces namespace pollution by moving the "struct net" declaration out of the userspace-facing portion of linux/netlink.h. It has no impact on the kernel. (This came up because we have several C++ applications which use "net" as a namespace name.) Ollie diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 59d0669..1235669 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -27,8 +27,6 @@ #define MAX_LINKS 32 -struct net; - struct sockaddr_nl { sa_family_t nl_family; /* AF_NETLINK */ unsigned short nl_pad; /* zero */ @@ -151,6 +149,8 @@ struct nlattr { #include #include +struct net; + static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) { return (struct nlmsghdr *)skb->data;