diff options
Diffstat (limited to 'drivers/net/wireless/b43/xmit.h')
-rw-r--r-- | drivers/net/wireless/b43/xmit.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h index d23ff9fe0c9e..d4cf9b390af3 100644 --- a/drivers/net/wireless/b43/xmit.h +++ b/drivers/net/wireless/b43/xmit.h | |||
@@ -10,8 +10,8 @@ | |||
10 | union { \ | 10 | union { \ |
11 | __le32 data; \ | 11 | __le32 data; \ |
12 | __u8 raw[size]; \ | 12 | __u8 raw[size]; \ |
13 | } __attribute__((__packed__)); \ | 13 | } __packed; \ |
14 | } __attribute__((__packed__)) | 14 | } __packed |
15 | 15 | ||
16 | /* struct b43_plcp_hdr4 */ | 16 | /* struct b43_plcp_hdr4 */ |
17 | _b43_declare_plcp_hdr(4); | 17 | _b43_declare_plcp_hdr(4); |
@@ -57,7 +57,7 @@ struct b43_txhdr { | |||
57 | __u8 rts_frame[16]; /* The RTS frame (if used) */ | 57 | __u8 rts_frame[16]; /* The RTS frame (if used) */ |
58 | PAD_BYTES(2); | 58 | PAD_BYTES(2); |
59 | struct b43_plcp_hdr6 plcp; /* Main PLCP header */ | 59 | struct b43_plcp_hdr6 plcp; /* Main PLCP header */ |
60 | } new_format __attribute__ ((__packed__)); | 60 | } new_format __packed; |
61 | 61 | ||
62 | /* The old r351 format. */ | 62 | /* The old r351 format. */ |
63 | struct { | 63 | struct { |
@@ -68,10 +68,10 @@ struct b43_txhdr { | |||
68 | __u8 rts_frame[16]; /* The RTS frame (if used) */ | 68 | __u8 rts_frame[16]; /* The RTS frame (if used) */ |
69 | PAD_BYTES(2); | 69 | PAD_BYTES(2); |
70 | struct b43_plcp_hdr6 plcp; /* Main PLCP header */ | 70 | struct b43_plcp_hdr6 plcp; /* Main PLCP header */ |
71 | } old_format __attribute__ ((__packed__)); | 71 | } old_format __packed; |
72 | 72 | ||
73 | } __attribute__ ((__packed__)); | 73 | } __packed; |
74 | } __attribute__ ((__packed__)); | 74 | } __packed; |
75 | 75 | ||
76 | /* MAC TX control */ | 76 | /* MAC TX control */ |
77 | #define B43_TXH_MAC_USEFBR 0x10000000 /* Use fallback rate for this AMPDU */ | 77 | #define B43_TXH_MAC_USEFBR 0x10000000 /* Use fallback rate for this AMPDU */ |
@@ -218,20 +218,20 @@ struct b43_rxhdr_fw4 { | |||
218 | struct { | 218 | struct { |
219 | __u8 jssi; /* PHY RX Status 1: JSSI */ | 219 | __u8 jssi; /* PHY RX Status 1: JSSI */ |
220 | __u8 sig_qual; /* PHY RX Status 1: Signal Quality */ | 220 | __u8 sig_qual; /* PHY RX Status 1: Signal Quality */ |
221 | } __attribute__ ((__packed__)); | 221 | } __packed; |
222 | 222 | ||
223 | /* RSSI for N-PHYs */ | 223 | /* RSSI for N-PHYs */ |
224 | struct { | 224 | struct { |
225 | __s8 power0; /* PHY RX Status 1: Power 0 */ | 225 | __s8 power0; /* PHY RX Status 1: Power 0 */ |
226 | __s8 power1; /* PHY RX Status 1: Power 1 */ | 226 | __s8 power1; /* PHY RX Status 1: Power 1 */ |
227 | } __attribute__ ((__packed__)); | 227 | } __packed; |
228 | } __attribute__ ((__packed__)); | 228 | } __packed; |
229 | __le16 phy_status2; /* PHY RX Status 2 */ | 229 | __le16 phy_status2; /* PHY RX Status 2 */ |
230 | __le16 phy_status3; /* PHY RX Status 3 */ | 230 | __le16 phy_status3; /* PHY RX Status 3 */ |
231 | __le32 mac_status; /* MAC RX status */ | 231 | __le32 mac_status; /* MAC RX status */ |
232 | __le16 mac_time; | 232 | __le16 mac_time; |
233 | __le16 channel; | 233 | __le16 channel; |
234 | } __attribute__ ((__packed__)); | 234 | } __packed; |
235 | 235 | ||
236 | /* PHY RX Status 0 */ | 236 | /* PHY RX Status 0 */ |
237 | #define B43_RX_PHYST0_GAINCTL 0x4000 /* Gain Control */ | 237 | #define B43_RX_PHYST0_GAINCTL 0x4000 /* Gain Control */ |