diff options
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.h | 12 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index 630c298a730..e4c70e359ce 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h | |||
@@ -35,7 +35,7 @@ struct zd_ctrlset { | |||
35 | __le16 current_length; | 35 | __le16 current_length; |
36 | u8 service; | 36 | u8 service; |
37 | __le16 next_frame_length; | 37 | __le16 next_frame_length; |
38 | } __attribute__((packed)); | 38 | } __packed; |
39 | 39 | ||
40 | #define ZD_CS_RESERVED_SIZE 25 | 40 | #define ZD_CS_RESERVED_SIZE 25 |
41 | 41 | ||
@@ -106,7 +106,7 @@ struct zd_ctrlset { | |||
106 | struct rx_length_info { | 106 | struct rx_length_info { |
107 | __le16 length[3]; | 107 | __le16 length[3]; |
108 | __le16 tag; | 108 | __le16 tag; |
109 | } __attribute__((packed)); | 109 | } __packed; |
110 | 110 | ||
111 | #define RX_LENGTH_INFO_TAG 0x697e | 111 | #define RX_LENGTH_INFO_TAG 0x697e |
112 | 112 | ||
@@ -117,7 +117,7 @@ struct rx_status { | |||
117 | u8 signal_quality_ofdm; | 117 | u8 signal_quality_ofdm; |
118 | u8 decryption_type; | 118 | u8 decryption_type; |
119 | u8 frame_status; | 119 | u8 frame_status; |
120 | } __attribute__((packed)); | 120 | } __packed; |
121 | 121 | ||
122 | /* rx_status field decryption_type */ | 122 | /* rx_status field decryption_type */ |
123 | #define ZD_RX_NO_WEP 0 | 123 | #define ZD_RX_NO_WEP 0 |
@@ -153,7 +153,7 @@ struct tx_status { | |||
153 | u8 mac[ETH_ALEN]; | 153 | u8 mac[ETH_ALEN]; |
154 | u8 retry; | 154 | u8 retry; |
155 | u8 failure; | 155 | u8 failure; |
156 | } __attribute__((packed)); | 156 | } __packed; |
157 | 157 | ||
158 | enum mac_flags { | 158 | enum mac_flags { |
159 | MAC_FIXED_CHANNEL = 0x01, | 159 | MAC_FIXED_CHANNEL = 0x01, |
@@ -225,7 +225,7 @@ enum { | |||
225 | struct ofdm_plcp_header { | 225 | struct ofdm_plcp_header { |
226 | u8 prefix[3]; | 226 | u8 prefix[3]; |
227 | __le16 service; | 227 | __le16 service; |
228 | } __attribute__((packed)); | 228 | } __packed; |
229 | 229 | ||
230 | static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header) | 230 | static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header) |
231 | { | 231 | { |
@@ -252,7 +252,7 @@ struct cck_plcp_header { | |||
252 | u8 service; | 252 | u8 service; |
253 | __le16 length; | 253 | __le16 length; |
254 | __le16 crc16; | 254 | __le16 crc16; |
255 | } __attribute__((packed)); | 255 | } __packed; |
256 | 256 | ||
257 | static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header) | 257 | static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header) |
258 | { | 258 | { |
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h index 049f8b91f02..1b1655cb7cb 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.h +++ b/drivers/net/wireless/zd1211rw/zd_usb.h | |||
@@ -79,17 +79,17 @@ enum control_requests { | |||
79 | struct usb_req_read_regs { | 79 | struct usb_req_read_regs { |
80 | __le16 id; | 80 | __le16 id; |
81 | __le16 addr[0]; | 81 | __le16 addr[0]; |
82 | } __attribute__((packed)); | 82 | } __packed; |
83 | 83 | ||
84 | struct reg_data { | 84 | struct reg_data { |
85 | __le16 addr; | 85 | __le16 addr; |
86 | __le16 value; | 86 | __le16 value; |
87 | } __attribute__((packed)); | 87 | } __packed; |
88 | 88 | ||
89 | struct usb_req_write_regs { | 89 | struct usb_req_write_regs { |
90 | __le16 id; | 90 | __le16 id; |
91 | struct reg_data reg_writes[0]; | 91 | struct reg_data reg_writes[0]; |
92 | } __attribute__((packed)); | 92 | } __packed; |
93 | 93 | ||
94 | enum { | 94 | enum { |
95 | RF_IF_LE = 0x02, | 95 | RF_IF_LE = 0x02, |
@@ -106,7 +106,7 @@ struct usb_req_rfwrite { | |||
106 | /* RF2595: 24 */ | 106 | /* RF2595: 24 */ |
107 | __le16 bit_values[0]; | 107 | __le16 bit_values[0]; |
108 | /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ | 108 | /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ |
109 | } __attribute__((packed)); | 109 | } __packed; |
110 | 110 | ||
111 | /* USB interrupt */ | 111 | /* USB interrupt */ |
112 | 112 | ||
@@ -123,12 +123,12 @@ enum usb_int_flags { | |||
123 | struct usb_int_header { | 123 | struct usb_int_header { |
124 | u8 type; /* must always be 1 */ | 124 | u8 type; /* must always be 1 */ |
125 | u8 id; | 125 | u8 id; |
126 | } __attribute__((packed)); | 126 | } __packed; |
127 | 127 | ||
128 | struct usb_int_regs { | 128 | struct usb_int_regs { |
129 | struct usb_int_header hdr; | 129 | struct usb_int_header hdr; |
130 | struct reg_data regs[0]; | 130 | struct reg_data regs[0]; |
131 | } __attribute__((packed)); | 131 | } __packed; |
132 | 132 | ||
133 | struct usb_int_retry_fail { | 133 | struct usb_int_retry_fail { |
134 | struct usb_int_header hdr; | 134 | struct usb_int_header hdr; |
@@ -136,7 +136,7 @@ struct usb_int_retry_fail { | |||
136 | u8 _dummy; | 136 | u8 _dummy; |
137 | u8 addr[ETH_ALEN]; | 137 | u8 addr[ETH_ALEN]; |
138 | u8 ibss_wakeup_dest; | 138 | u8 ibss_wakeup_dest; |
139 | } __attribute__((packed)); | 139 | } __packed; |
140 | 140 | ||
141 | struct read_regs_int { | 141 | struct read_regs_int { |
142 | struct completion completion; | 142 | struct completion completion; |