From patchwork Thu Aug 25 04:43:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 111443 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 2AF94B6F64 for ; Thu, 25 Aug 2011 14:43:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964Ab1HYEnu (ORCPT ); Thu, 25 Aug 2011 00:43:50 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:37139 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846Ab1HYEnu (ORCPT ); Thu, 25 Aug 2011 00:43:50 -0400 Received: from [2001:470:1f08:1539:21c:bfff:fe03:f805] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QwRnB-00074R-DR; Thu, 25 Aug 2011 05:43:49 +0100 Received: from ben by deadeye with local (Exim 4.76) (envelope-from ) id 1QwRnC-0001M2-PB; Thu, 25 Aug 2011 05:43:50 +0100 Subject: [PATCH net-next v2 03/10] headers, pppol2tp: Use __kernel_pid_t in From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org Date: Thu, 25 Aug 2011 05:43:50 +0100 In-Reply-To: <1314247131.27179.116.camel@deadeye> References: <1314247131.27179.116.camel@deadeye> X-Mailer: Evolution 3.0.2- Message-ID: <1314247430.27179.120.camel@deadeye> Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:470:1f08:1539:21c:bfff:fe03:f805 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org defines __kernel_pid_t for userland; pid_t is defined elsewhere (and potentially differently). Signed-off-by: Ben Hutchings --- include/linux/if_pppol2tp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h index 184bc55..23cefa1 100644 --- a/include/linux/if_pppol2tp.h +++ b/include/linux/if_pppol2tp.h @@ -39,7 +39,7 @@ struct pppol2tp_addr { * bits. So we need a different sockaddr structure. */ struct pppol2tpv3_addr { - pid_t pid; /* pid that owns the fd. + __kernel_pid_t pid; /* pid that owns the fd. * 0 => current */ int fd; /* FD of UDP or IP socket to use */