diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_wlan.h')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_wlan.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h index 3d238917af0..c02f8667a7e 100644 --- a/drivers/net/wireless/hostap/hostap_wlan.h +++ b/drivers/net/wireless/hostap/hostap_wlan.h | |||
@@ -31,14 +31,14 @@ struct linux_wlan_ng_val { | |||
31 | u32 did; | 31 | u32 did; |
32 | u16 status, len; | 32 | u16 status, len; |
33 | u32 data; | 33 | u32 data; |
34 | } __attribute__ ((packed)); | 34 | } __packed; |
35 | 35 | ||
36 | struct linux_wlan_ng_prism_hdr { | 36 | struct linux_wlan_ng_prism_hdr { |
37 | u32 msgcode, msglen; | 37 | u32 msgcode, msglen; |
38 | char devname[16]; | 38 | char devname[16]; |
39 | struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal, | 39 | struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal, |
40 | noise, rate, istx, frmlen; | 40 | noise, rate, istx, frmlen; |
41 | } __attribute__ ((packed)); | 41 | } __packed; |
42 | 42 | ||
43 | struct linux_wlan_ng_cap_hdr { | 43 | struct linux_wlan_ng_cap_hdr { |
44 | __be32 version; | 44 | __be32 version; |
@@ -55,7 +55,7 @@ struct linux_wlan_ng_cap_hdr { | |||
55 | __be32 ssi_noise; | 55 | __be32 ssi_noise; |
56 | __be32 preamble; | 56 | __be32 preamble; |
57 | __be32 encoding; | 57 | __be32 encoding; |
58 | } __attribute__ ((packed)); | 58 | } __packed; |
59 | 59 | ||
60 | struct hostap_radiotap_rx { | 60 | struct hostap_radiotap_rx { |
61 | struct ieee80211_radiotap_header hdr; | 61 | struct ieee80211_radiotap_header hdr; |
@@ -66,7 +66,7 @@ struct hostap_radiotap_rx { | |||
66 | __le16 chan_flags; | 66 | __le16 chan_flags; |
67 | s8 dbm_antsignal; | 67 | s8 dbm_antsignal; |
68 | s8 dbm_antnoise; | 68 | s8 dbm_antnoise; |
69 | } __attribute__ ((packed)); | 69 | } __packed; |
70 | 70 | ||
71 | #define LWNG_CAP_DID_BASE (4 | (1 << 6)) /* section 4, group 1 */ | 71 | #define LWNG_CAP_DID_BASE (4 | (1 << 6)) /* section 4, group 1 */ |
72 | #define LWNG_CAPHDR_VERSION 0x80211001 | 72 | #define LWNG_CAPHDR_VERSION 0x80211001 |
@@ -97,7 +97,7 @@ struct hfa384x_rx_frame { | |||
97 | __be16 len; | 97 | __be16 len; |
98 | 98 | ||
99 | /* followed by frame data; max 2304 bytes */ | 99 | /* followed by frame data; max 2304 bytes */ |
100 | } __attribute__ ((packed)); | 100 | } __packed; |
101 | 101 | ||
102 | 102 | ||
103 | struct hfa384x_tx_frame { | 103 | struct hfa384x_tx_frame { |
@@ -126,14 +126,14 @@ struct hfa384x_tx_frame { | |||
126 | __be16 len; | 126 | __be16 len; |
127 | 127 | ||
128 | /* followed by frame data; max 2304 bytes */ | 128 | /* followed by frame data; max 2304 bytes */ |
129 | } __attribute__ ((packed)); | 129 | } __packed; |
130 | 130 | ||
131 | 131 | ||
132 | struct hfa384x_rid_hdr | 132 | struct hfa384x_rid_hdr |
133 | { | 133 | { |
134 | __le16 len; | 134 | __le16 len; |
135 | __le16 rid; | 135 | __le16 rid; |
136 | } __attribute__ ((packed)); | 136 | } __packed; |
137 | 137 | ||
138 | 138 | ||
139 | /* Macro for converting signal levels (range 27 .. 154) to wireless ext | 139 | /* Macro for converting signal levels (range 27 .. 154) to wireless ext |
@@ -145,24 +145,24 @@ struct hfa384x_rid_hdr | |||
145 | struct hfa384x_scan_request { | 145 | struct hfa384x_scan_request { |
146 | __le16 channel_list; | 146 | __le16 channel_list; |
147 | __le16 txrate; /* HFA384X_RATES_* */ | 147 | __le16 txrate; /* HFA384X_RATES_* */ |
148 | } __attribute__ ((packed)); | 148 | } __packed; |
149 | 149 | ||
150 | struct hfa384x_hostscan_request { | 150 | struct hfa384x_hostscan_request { |
151 | __le16 channel_list; | 151 | __le16 channel_list; |
152 | __le16 txrate; | 152 | __le16 txrate; |
153 | __le16 target_ssid_len; | 153 | __le16 target_ssid_len; |
154 | u8 target_ssid[32]; | 154 | u8 target_ssid[32]; |
155 | } __attribute__ ((packed)); | 155 | } __packed; |
156 | 156 | ||
157 | struct hfa384x_join_request { | 157 | struct hfa384x_join_request { |
158 | u8 bssid[6]; | 158 | u8 bssid[6]; |
159 | __le16 channel; | 159 | __le16 channel; |
160 | } __attribute__ ((packed)); | 160 | } __packed; |
161 | 161 | ||
162 | struct hfa384x_info_frame { | 162 | struct hfa384x_info_frame { |
163 | __le16 len; | 163 | __le16 len; |
164 | __le16 type; | 164 | __le16 type; |
165 | } __attribute__ ((packed)); | 165 | } __packed; |
166 | 166 | ||
167 | struct hfa384x_comm_tallies { | 167 | struct hfa384x_comm_tallies { |
168 | __le16 tx_unicast_frames; | 168 | __le16 tx_unicast_frames; |
@@ -186,7 +186,7 @@ struct hfa384x_comm_tallies { | |||
186 | __le16 rx_discards_wep_undecryptable; | 186 | __le16 rx_discards_wep_undecryptable; |
187 | __le16 rx_message_in_msg_fragments; | 187 | __le16 rx_message_in_msg_fragments; |
188 | __le16 rx_message_in_bad_msg_fragments; | 188 | __le16 rx_message_in_bad_msg_fragments; |
189 | } __attribute__ ((packed)); | 189 | } __packed; |
190 | 190 | ||
191 | struct hfa384x_comm_tallies32 { | 191 | struct hfa384x_comm_tallies32 { |
192 | __le32 tx_unicast_frames; | 192 | __le32 tx_unicast_frames; |
@@ -210,7 +210,7 @@ struct hfa384x_comm_tallies32 { | |||
210 | __le32 rx_discards_wep_undecryptable; | 210 | __le32 rx_discards_wep_undecryptable; |
211 | __le32 rx_message_in_msg_fragments; | 211 | __le32 rx_message_in_msg_fragments; |
212 | __le32 rx_message_in_bad_msg_fragments; | 212 | __le32 rx_message_in_bad_msg_fragments; |
213 | } __attribute__ ((packed)); | 213 | } __packed; |
214 | 214 | ||
215 | struct hfa384x_scan_result_hdr { | 215 | struct hfa384x_scan_result_hdr { |
216 | __le16 reserved; | 216 | __le16 reserved; |
@@ -219,7 +219,7 @@ struct hfa384x_scan_result_hdr { | |||
219 | #define HFA384X_SCAN_HOST_INITIATED 1 | 219 | #define HFA384X_SCAN_HOST_INITIATED 1 |
220 | #define HFA384X_SCAN_FIRMWARE_INITIATED 2 | 220 | #define HFA384X_SCAN_FIRMWARE_INITIATED 2 |
221 | #define HFA384X_SCAN_INQUIRY_FROM_HOST 3 | 221 | #define HFA384X_SCAN_INQUIRY_FROM_HOST 3 |
222 | } __attribute__ ((packed)); | 222 | } __packed; |
223 | 223 | ||
224 | #define HFA384X_SCAN_MAX_RESULTS 32 | 224 | #define HFA384X_SCAN_MAX_RESULTS 32 |
225 | 225 | ||
@@ -234,7 +234,7 @@ struct hfa384x_scan_result { | |||
234 | u8 ssid[32]; | 234 | u8 ssid[32]; |
235 | u8 sup_rates[10]; | 235 | u8 sup_rates[10]; |
236 | __le16 rate; | 236 | __le16 rate; |
237 | } __attribute__ ((packed)); | 237 | } __packed; |
238 | 238 | ||
239 | struct hfa384x_hostscan_result { | 239 | struct hfa384x_hostscan_result { |
240 | __le16 chid; | 240 | __le16 chid; |
@@ -248,7 +248,7 @@ struct hfa384x_hostscan_result { | |||
248 | u8 sup_rates[10]; | 248 | u8 sup_rates[10]; |
249 | __le16 rate; | 249 | __le16 rate; |
250 | __le16 atim; | 250 | __le16 atim; |
251 | } __attribute__ ((packed)); | 251 | } __packed; |
252 | 252 | ||
253 | struct comm_tallies_sums { | 253 | struct comm_tallies_sums { |
254 | unsigned int tx_unicast_frames; | 254 | unsigned int tx_unicast_frames; |