From owner-svn-src-projects@FreeBSD.ORG Wed Jul 1 01:26:51 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1E361065672; Wed, 1 Jul 2009 01:26:51 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C0F098FC16; Wed, 1 Jul 2009 01:26:51 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n611QpHR097524; Wed, 1 Jul 2009 01:26:51 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n611QpSg097522; Wed, 1 Jul 2009 01:26:51 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200907010126.n611QpSg097522@svn.freebsd.org> From: Sam Leffler Date: Wed, 1 Jul 2009 01:26:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195221 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2009 01:26:52 -0000 Author: sam Date: Wed Jul 1 01:26:51 2009 New Revision: 195221 URL: http://svn.freebsd.org/changeset/base/195221 Log: pack ieee80211_meshcntl structs so sizeof works on arm Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Wed Jul 1 01:24:58 2009 (r195220) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Wed Jul 1 01:26:51 2009 (r195221) @@ -337,21 +337,21 @@ enum { * Different mesh control structures based on the AE * (Address Extension) bits. * - * NB: not __packed because mc_seq isn't uint32_t. + * NB: __packed added so sizeof works on arm, et. al. */ struct ieee80211_meshcntl { uint8_t mc_flags; /* Address Extension 00 */ uint8_t mc_ttl; /* TTL */ uint8_t mc_seq[4]; /* Sequence No. */ /* NB: more addresses may follow */ -}; +} __packed; struct ieee80211_meshcntl_ae01 { uint8_t mc_flags; /* Address Extension 01 */ uint8_t mc_ttl; /* TTL */ uint8_t mc_seq[4]; /* Sequence No. */ uint8_t mc_addr4[IEEE80211_ADDR_LEN]; -}; +} __packed; struct ieee80211_meshcntl_ae10 { uint8_t mc_flags; /* Address Extension 10 */ @@ -359,7 +359,7 @@ struct ieee80211_meshcntl_ae10 { uint8_t mc_seq[4]; /* Sequence No. */ uint8_t mc_addr5[IEEE80211_ADDR_LEN]; uint8_t mc_addr6[IEEE80211_ADDR_LEN]; -}; +} __packed; struct ieee80211_meshcntl_ae11 { uint8_t mc_flags; /* Address Extension 11 */ @@ -368,7 +368,7 @@ struct ieee80211_meshcntl_ae11 { uint8_t mc_addr4[IEEE80211_ADDR_LEN]; uint8_t mc_addr5[IEEE80211_ADDR_LEN]; uint8_t mc_addr6[IEEE80211_ADDR_LEN]; -}; +} __packed; #ifdef _KERNEL struct ieee80211_mesh_proto {