From owner-svn-src-projects@FreeBSD.ORG Wed Jul 8 16:04:15 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 88A08106564A; Wed, 8 Jul 2009 16:04:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5BFF98FC1A; Wed, 8 Jul 2009 16:04:15 +0000 (UTC) (envelope-from rpaulo@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 n68G4FMK056099; Wed, 8 Jul 2009 16:04:15 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n68G4F0g056097; Wed, 8 Jul 2009 16:04:15 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200907081604.n68G4F0g056097@svn.freebsd.org> From: Rui Paulo Date: Wed, 8 Jul 2009 16:04:15 +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: r195463 - 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, 08 Jul 2009 16:04:15 -0000 Author: rpaulo Date: Wed Jul 8 16:04:15 2009 New Revision: 195463 URL: http://svn.freebsd.org/changeset/base/195463 Log: Revert 195460: gcc does evil things without __packed. Sponsored by: The FreeBSD Foundation 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 8 15:57:22 2009 (r195462) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Wed Jul 8 16:04:15 2009 (r195463) @@ -46,7 +46,7 @@ struct ieee80211_meshconf_ie { uint8_t conf_authid[4]; /* Auth. Protocol ID */ uint8_t conf_form; /* Formation Information */ uint8_t conf_cap; -}; +} __packed; #define IEEE80211_MESHCONF_VERSION 1 /* Null Protocol */ @@ -93,7 +93,7 @@ struct ieee80211_meshconf_ie { struct ieee80211_meshid_ie { uint8_t id_ie; /* IEEE80211_ELEMID_MESHID */ uint8_t id_len; -}; +} __packed; #define IEEE80211_MESHID_LEN IEEE80211_NWID_LEN @@ -118,7 +118,7 @@ struct ieee80211_meshpeerver_ie { uint8_t peerver_ie; /* IEEE80211_ELEMID_MESHPEERVER */ uint8_t peerver_len; uint8_t peerver_proto[4]; -}; +} __packed; /* Mesh Peering Management Protocol */ #define IEEE80211_MESHPEERVER_PEER_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHPEERVER_PEER_VALUE 0x2a @@ -157,7 +157,7 @@ struct ieee80211_meshcsa_ie { uint8_t csa_newchan; uint8_t csa_precvalue; /* Precedence Value */ uint8_t csa_count; -}; +} __packed; /* Mesh TIM */ /* Equal to the non Mesh version */ @@ -167,7 +167,7 @@ struct ieee80211_meshawakew_ie { uint8_t awakew_ie; /* IEEE80211_ELEMID_MESHAWAKEW */ uint8_t awakew_len; uint8_t awakew_windowlen; /* in TUs */ -}; +} __packed; /* Mesh Beacon Timing */ struct ieee80211_meshbeacont_ie { @@ -190,7 +190,7 @@ struct ieee80211_meshpann_ie { uint8_t pann_ttl; uint8_t pann_addr[IEEE80211_ADDR_LEN]; uint8_t pann_seq; /* PANN Sequence Number */ -}; +} __packed; /* Root (MP) Annoucement */ struct ieee80211_meshrann_ie { @@ -274,7 +274,7 @@ struct ieee80211_meshpu_ie { uint8_t pu_addr[IEEE80211_ADDR_LEN]; uint8_t pu_naddr; /* Number of Proxied Addresses */ /* NB: proxied address follows */ -}; +} __packed; /* Mesh Proxy Update Confirmation */ struct ieee80211_meshpuc_ie { @@ -283,7 +283,7 @@ struct ieee80211_meshpuc_ie { uint8_t puc_flags; uint8_t puc_seq; /* PU Sequence Number */ uint8_t puc_daddr[IEEE80211_ADDR_LEN]; -}; +} __packed; #endif /*