diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 23:37:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 23:37:37 +0200 |
| commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
| tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /drivers/net/wireless/libertas/hostcmd.h | |
| parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
| parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/wireless/libertas/hostcmd.h')
| -rw-r--r-- | drivers/net/wireless/libertas/hostcmd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h index 0a2e29140ad..c8a1998d474 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h @@ -56,8 +56,8 @@ struct rxpd { u8 bss_type; /* BSS number */ u8 bss_num; - } bss; - } u; + } __attribute__ ((packed)) bss; + } __attribute__ ((packed)) u; /* SNR */ u8 snr; |