From patchwork Tue Jan 7 06:48:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "fan.du" X-Patchwork-Id: 307546 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 7D83B2C00A0 for ; Tue, 7 Jan 2014 17:49:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813AbaAGGtN (ORCPT ); Tue, 7 Jan 2014 01:49:13 -0500 Received: from mail.windriver.com ([147.11.1.11]:40469 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbaAGGtM (ORCPT ); Tue, 7 Jan 2014 01:49:12 -0500 Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id s076n3GZ023225 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 6 Jan 2014 22:49:04 -0800 (PST) Received: from iamroot-OptiPlex-780.corp.ad.wrs.com (128.224.162.236) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.2.347.0; Mon, 6 Jan 2014 22:49:03 -0800 From: Fan Du To: CC: , , , Subject: [PATCH net-next 1/2] include/uapi/linux/xfrm.h: Pack struct xfrm_userpolicy_info Date: Tue, 7 Jan 2014 14:48:58 +0800 Message-ID: <1389077339-12814-2-git-send-email-fan.du@windriver.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389077339-12814-1-git-send-email-fan.du@windriver.com> References: <1389077339-12814-1-git-send-email-fan.du@windriver.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Otherwise 64bits kernel has sizeof(struct xfrm_userpolicy_info) 168 bytes, while 32bits compiled iproute2 see the same structure as 164 bytes, which leading deficit xfrm policy, in turn broken IPsec connectivity. Fix this by packing the structure. Signed-off-by: Fan Du --- include/uapi/linux/xfrm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index a8cd6a4..470bfae 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -405,7 +405,7 @@ struct xfrm_userpolicy_info { /* Automatically expand selector to include matching ICMP payloads. */ #define XFRM_POLICY_ICMP 2 __u8 share; -}; +} __attribute__((packed)); struct xfrm_userpolicy_id { struct xfrm_selector sel;