svn commit: r195221 - projects/mesh11s/sys/net80211
Sam Leffler
sam at FreeBSD.org
Wed Jul 1 01:26:52 UTC 2009
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 {
More information about the svn-src-projects
mailing list