diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-09 23:47:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-09 23:47:39 -0400 |
| commit | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (patch) | |
| tree | e4e562be1a6b7fa8b318107effb358d187dc6b0a /drivers/net/wireless/libertas | |
| parent | 0d502d8267ebab9ae4b5b4c065d20196d6069f52 (diff) | |
| parent | dd1f57ecaf9688efa69d982652ecfa3e64f1fa55 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas')
| -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; |