From owner-svn-src-stable-10@FreeBSD.ORG  Sat Jun  6 20:14:59 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BA18378;
 Sat,  6 Jun 2015 20:14:59 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2940A1A31;
 Sat,  6 Jun 2015 20:14:59 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t56KExcH047997;
 Sat, 6 Jun 2015 20:14:59 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t56KExfb047996;
 Sat, 6 Jun 2015 20:14:59 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201506062014.t56KExfb047996@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 6 Jun 2015 20:14:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284099 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jun 2015 20:14:59 -0000

Author: ian
Date: Sat Jun  6 20:14:58 2015
New Revision: 284099
URL: https://svnweb.freebsd.org/changeset/base/284099

Log:
  MFC r279236:
  
    Change struct attribute to avoid aligned operations mismatch
    Previous __alignment(4) allowed compiler to assume that operations are
    performed on aligned region. On ARM processor, this led to alignment fault

Modified:
  stable/10/sys/netinet/ip.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/ip.h
==============================================================================
--- stable/10/sys/netinet/ip.h	Sat Jun  6 20:01:06 2015	(r284098)
+++ stable/10/sys/netinet/ip.h	Sat Jun  6 20:14:58 2015	(r284099)
@@ -67,7 +67,7 @@ struct ip {
 	u_char	ip_p;			/* protocol */
 	u_short	ip_sum;			/* checksum */
 	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-} __packed __aligned(4);
+} __packed __aligned(2);
 
 #define	IP_MAXPACKET	65535		/* maximum packet size */