diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
| commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
| tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /drivers/net/wireless/rt2x00/rt73usb.h | |
| parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
| parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h index 7abe7eb14555..44d5b2bebd39 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.h +++ b/drivers/net/wireless/rt2x00/rt73usb.h | |||
| @@ -108,13 +108,13 @@ struct hw_key_entry { | |||
| 108 | u8 key[16]; | 108 | u8 key[16]; |
| 109 | u8 tx_mic[8]; | 109 | u8 tx_mic[8]; |
| 110 | u8 rx_mic[8]; | 110 | u8 rx_mic[8]; |
| 111 | } __attribute__ ((packed)); | 111 | } __packed; |
| 112 | 112 | ||
| 113 | struct hw_pairwise_ta_entry { | 113 | struct hw_pairwise_ta_entry { |
| 114 | u8 address[6]; | 114 | u8 address[6]; |
| 115 | u8 cipher; | 115 | u8 cipher; |
| 116 | u8 reserved; | 116 | u8 reserved; |
| 117 | } __attribute__ ((packed)); | 117 | } __packed; |
| 118 | 118 | ||
| 119 | /* | 119 | /* |
| 120 | * Since NULL frame won't be that long (256 byte), | 120 | * Since NULL frame won't be that long (256 byte), |