On Thu, Feb 07, 2008 at 12:02:38PM -0800, Andrew Morton wrote: > On Thu, 7 Feb 2008 14:08:42 -0500 > "John W. Linville" <linville@xxxxxxxxxxxxx> wrote: > > Subject: [PATCH] wavelan: mark hardware interfacing structures as packed > ha_t is still triggering with this patch. > > This incremental patch: <snip> > fixes things up. If forces `union hacs_u' to be two bytes, not four. OK, so I'll queue this one...'salright? --- From: John W. Linville <linville@xxxxxxxxxxxxx> Subject: [PATCH] wavelan: mark hardware interfacing structures as packed With assists from Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> and Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>... Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> --- drivers/net/wireless/wavelan.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/wavelan.h b/drivers/net/wireless/wavelan.h index 27172cd..9ab3605 100644 --- a/drivers/net/wireless/wavelan.h +++ b/drivers/net/wireless/wavelan.h @@ -85,7 +85,7 @@ union hacs_u #define HASR_MMC_INTR 0x0002 /* Interrupt request from MMC */ #define HASR_MMC_BUSY 0x0004 /* MMC busy indication */ #define HASR_PSA_BUSY 0x0008 /* LAN parameter storage area busy */ -}; +} __attribute__ ((packed)); typedef struct ha_t ha_t; struct ha_t @@ -292,7 +292,7 @@ struct mmw_t #define MMW_EXT_ANT_INTERNAL 0x00 /* Internal antenna */ #define MMW_EXT_ANT_EXTERNAL 0x03 /* External antenna */ #define MMW_EXT_ANT_IQ_TEST 0x1C /* IQ test pattern (set to 0) */ -}; +} __attribute__ ((packed)); #define MMW_SIZE 37 @@ -347,7 +347,7 @@ struct mmr_t unsigned char mmr_unused4[1]; /* unused */ unsigned char mmr_fee_data_l; /* Read data from EEPROM (low) */ unsigned char mmr_fee_data_h; /* Read data from EEPROM (high) */ -}; +} __attribute__ ((packed)); #define MMR_SIZE 36 -- 1.5.3.3 -- John W. Linville linville@xxxxxxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
