From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161256AbWF0UME (ORCPT ); Tue, 27 Jun 2006 16:12:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161257AbWF0UMB (ORCPT ); Tue, 27 Jun 2006 16:12:01 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:45440 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1161256AbWF0UL6 (ORCPT ); Tue, 27 Jun 2006 16:11:58 -0400 Message-Id: <20060627200946.412443000@sous-sol.org> References: <20060627200745.771284000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Tue, 27 Jun 2006 00:00:04 -0700 From: Chris Wright 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 , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, David Miller , Tushar Gohad Subject: [PATCH 04/25] PFKEYV2: Fix inconsistent typing in struct sadb_x_kmprivate. Content-Disposition: inline; filename=pfkeyv2-fix-inconsistent-typing-in-struct-sadb_x_kmprivate.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Tushar Gohad Fixes inconsistent use of "uint32_t" vs. "u_int32_t". Fix pfkeyv2 userspace builds. Signed-off-by: Tushar Gohad Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- include/linux/pfkeyv2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.17.1.orig/include/linux/pfkeyv2.h +++ linux-2.6.17.1/include/linux/pfkeyv2.h @@ -159,7 +159,7 @@ struct sadb_spirange { struct sadb_x_kmprivate { uint16_t sadb_x_kmprivate_len; uint16_t sadb_x_kmprivate_exttype; - u_int32_t sadb_x_kmprivate_reserved; + uint32_t sadb_x_kmprivate_reserved; } __attribute__((packed)); /* sizeof(struct sadb_x_kmprivate) == 8 */ --