diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/net/wireless/libertas/hostcmd.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
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 0a2e29140add..c8a1998d4744 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h | |||
| @@ -56,8 +56,8 @@ struct rxpd { | |||
| 56 | u8 bss_type; | 56 | u8 bss_type; |
| 57 | /* BSS number */ | 57 | /* BSS number */ |
| 58 | u8 bss_num; | 58 | u8 bss_num; |
| 59 | } bss; | 59 | } __attribute__ ((packed)) bss; |
| 60 | } u; | 60 | } __attribute__ ((packed)) u; |
| 61 | 61 | ||
| 62 | /* SNR */ | 62 | /* SNR */ |
| 63 | u8 snr; | 63 | u8 snr; |