diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/b43legacy | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
-rw-r--r-- | drivers/net/wireless/b43legacy/b43legacy.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/xmit.h | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h index 89fe2f972c72..c81b2f53b0c5 100644 --- a/drivers/net/wireless/b43legacy/b43legacy.h +++ b/drivers/net/wireless/b43legacy/b43legacy.h | |||
@@ -372,7 +372,7 @@ struct b43legacy_fw_header { | |||
372 | /* Size of the data. For ucode and PCM this is in bytes. | 372 | /* Size of the data. For ucode and PCM this is in bytes. |
373 | * For IV this is number-of-ivs. */ | 373 | * For IV this is number-of-ivs. */ |
374 | __be32 size; | 374 | __be32 size; |
375 | } __attribute__((__packed__)); | 375 | } __packed; |
376 | 376 | ||
377 | /* Initial Value file format */ | 377 | /* Initial Value file format */ |
378 | #define B43legacy_IV_OFFSET_MASK 0x7FFF | 378 | #define B43legacy_IV_OFFSET_MASK 0x7FFF |
@@ -382,8 +382,8 @@ struct b43legacy_iv { | |||
382 | union { | 382 | union { |
383 | __be16 d16; | 383 | __be16 d16; |
384 | __be32 d32; | 384 | __be32 d32; |
385 | } data __attribute__((__packed__)); | 385 | } data __packed; |
386 | } __attribute__((__packed__)); | 386 | } __packed; |
387 | 387 | ||
388 | #define B43legacy_PHYMODE(phytype) (1 << (phytype)) | 388 | #define B43legacy_PHYMODE(phytype) (1 << (phytype)) |
389 | #define B43legacy_PHYMODE_B B43legacy_PHYMODE \ | 389 | #define B43legacy_PHYMODE_B B43legacy_PHYMODE \ |
diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h index f9681041c2d8..f89c34226288 100644 --- a/drivers/net/wireless/b43legacy/dma.h +++ b/drivers/net/wireless/b43legacy/dma.h | |||
@@ -72,7 +72,7 @@ | |||
72 | struct b43legacy_dmadesc32 { | 72 | struct b43legacy_dmadesc32 { |
73 | __le32 control; | 73 | __le32 control; |
74 | __le32 address; | 74 | __le32 address; |
75 | } __attribute__((__packed__)); | 75 | } __packed; |
76 | #define B43legacy_DMA32_DCTL_BYTECNT 0x00001FFF | 76 | #define B43legacy_DMA32_DCTL_BYTECNT 0x00001FFF |
77 | #define B43legacy_DMA32_DCTL_ADDREXT_MASK 0x00030000 | 77 | #define B43legacy_DMA32_DCTL_ADDREXT_MASK 0x00030000 |
78 | #define B43legacy_DMA32_DCTL_ADDREXT_SHIFT 16 | 78 | #define B43legacy_DMA32_DCTL_ADDREXT_SHIFT 16 |
@@ -147,7 +147,7 @@ struct b43legacy_dmadesc64 { | |||
147 | __le32 control1; | 147 | __le32 control1; |
148 | __le32 address_low; | 148 | __le32 address_low; |
149 | __le32 address_high; | 149 | __le32 address_high; |
150 | } __attribute__((__packed__)); | 150 | } __packed; |
151 | #define B43legacy_DMA64_DCTL0_DTABLEEND 0x10000000 | 151 | #define B43legacy_DMA64_DCTL0_DTABLEEND 0x10000000 |
152 | #define B43legacy_DMA64_DCTL0_IRQ 0x20000000 | 152 | #define B43legacy_DMA64_DCTL0_IRQ 0x20000000 |
153 | #define B43legacy_DMA64_DCTL0_FRAMEEND 0x40000000 | 153 | #define B43legacy_DMA64_DCTL0_FRAMEEND 0x40000000 |
@@ -162,8 +162,8 @@ struct b43legacy_dmadesc_generic { | |||
162 | union { | 162 | union { |
163 | struct b43legacy_dmadesc32 dma32; | 163 | struct b43legacy_dmadesc32 dma32; |
164 | struct b43legacy_dmadesc64 dma64; | 164 | struct b43legacy_dmadesc64 dma64; |
165 | } __attribute__((__packed__)); | 165 | } __packed; |
166 | } __attribute__((__packed__)); | 166 | } __packed; |
167 | 167 | ||
168 | 168 | ||
169 | /* Misc DMA constants */ | 169 | /* Misc DMA constants */ |
diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/b43legacy/xmit.h index 91633087a20b..289db00a4a7b 100644 --- a/drivers/net/wireless/b43legacy/xmit.h +++ b/drivers/net/wireless/b43legacy/xmit.h | |||
@@ -9,8 +9,8 @@ | |||
9 | union { \ | 9 | union { \ |
10 | __le32 data; \ | 10 | __le32 data; \ |
11 | __u8 raw[size]; \ | 11 | __u8 raw[size]; \ |
12 | } __attribute__((__packed__)); \ | 12 | } __packed; \ |
13 | } __attribute__((__packed__)) | 13 | } __packed |
14 | 14 | ||
15 | /* struct b43legacy_plcp_hdr4 */ | 15 | /* struct b43legacy_plcp_hdr4 */ |
16 | _b43legacy_declare_plcp_hdr(4); | 16 | _b43legacy_declare_plcp_hdr(4); |
@@ -39,7 +39,7 @@ struct b43legacy_txhdr_fw3 { | |||
39 | struct b43legacy_plcp_hdr6 rts_plcp; /* RTS PLCP */ | 39 | struct b43legacy_plcp_hdr6 rts_plcp; /* RTS PLCP */ |
40 | __u8 rts_frame[18]; /* The RTS frame (if used) */ | 40 | __u8 rts_frame[18]; /* The RTS frame (if used) */ |
41 | struct b43legacy_plcp_hdr6 plcp; | 41 | struct b43legacy_plcp_hdr6 plcp; |
42 | } __attribute__((__packed__)); | 42 | } __packed; |
43 | 43 | ||
44 | /* MAC TX control */ | 44 | /* MAC TX control */ |
45 | #define B43legacy_TX4_MAC_KEYIDX 0x0FF00000 /* Security key index */ | 45 | #define B43legacy_TX4_MAC_KEYIDX 0x0FF00000 /* Security key index */ |
@@ -123,7 +123,7 @@ struct b43legacy_hwtxstatus { | |||
123 | __le16 seq; | 123 | __le16 seq; |
124 | u8 phy_stat; | 124 | u8 phy_stat; |
125 | PAD_BYTES(1); | 125 | PAD_BYTES(1); |
126 | } __attribute__((__packed__)); | 126 | } __packed; |
127 | 127 | ||
128 | 128 | ||
129 | /* Receive header for v3 firmware. */ | 129 | /* Receive header for v3 firmware. */ |
@@ -138,7 +138,7 @@ struct b43legacy_rxhdr_fw3 { | |||
138 | __le16 mac_status; /* MAC RX status */ | 138 | __le16 mac_status; /* MAC RX status */ |
139 | __le16 mac_time; | 139 | __le16 mac_time; |
140 | __le16 channel; | 140 | __le16 channel; |
141 | } __attribute__((__packed__)); | 141 | } __packed; |
142 | 142 | ||
143 | 143 | ||
144 | /* PHY RX Status 0 */ | 144 | /* PHY RX Status 0 */ |