diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/hermes.h')
-rw-r--r-- | drivers/net/wireless/orinoco/hermes.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/orinoco/hermes.h index 9ca34e722b4..d9f18c11682 100644 --- a/drivers/net/wireless/orinoco/hermes.h +++ b/drivers/net/wireless/orinoco/hermes.h | |||
@@ -205,7 +205,7 @@ struct hermes_tx_descriptor { | |||
205 | u8 retry_count; | 205 | u8 retry_count; |
206 | u8 tx_rate; | 206 | u8 tx_rate; |
207 | __le16 tx_control; | 207 | __le16 tx_control; |
208 | } __attribute__ ((packed)); | 208 | } __packed; |
209 | 209 | ||
210 | #define HERMES_TXSTAT_RETRYERR (0x0001) | 210 | #define HERMES_TXSTAT_RETRYERR (0x0001) |
211 | #define HERMES_TXSTAT_AGEDERR (0x0002) | 211 | #define HERMES_TXSTAT_AGEDERR (0x0002) |
@@ -254,7 +254,7 @@ struct hermes_tallies_frame { | |||
254 | /* Those last are probably not available in very old firmwares */ | 254 | /* Those last are probably not available in very old firmwares */ |
255 | __le16 RxDiscards_WEPICVError; | 255 | __le16 RxDiscards_WEPICVError; |
256 | __le16 RxDiscards_WEPExcluded; | 256 | __le16 RxDiscards_WEPExcluded; |
257 | } __attribute__ ((packed)); | 257 | } __packed; |
258 | 258 | ||
259 | /* Grabbed from wlan-ng - Thanks Mark... - Jean II | 259 | /* Grabbed from wlan-ng - Thanks Mark... - Jean II |
260 | * This is the result of a scan inquiry command */ | 260 | * This is the result of a scan inquiry command */ |
@@ -271,7 +271,7 @@ struct prism2_scan_apinfo { | |||
271 | u8 rates[10]; /* Bit rate supported */ | 271 | u8 rates[10]; /* Bit rate supported */ |
272 | __le16 proberesp_rate; /* Data rate of the response frame */ | 272 | __le16 proberesp_rate; /* Data rate of the response frame */ |
273 | __le16 atim; /* ATIM window time, Kus (hostscan only) */ | 273 | __le16 atim; /* ATIM window time, Kus (hostscan only) */ |
274 | } __attribute__ ((packed)); | 274 | } __packed; |
275 | 275 | ||
276 | /* Same stuff for the Lucent/Agere card. | 276 | /* Same stuff for the Lucent/Agere card. |
277 | * Thanks to h1kari <h1kari AT dachb0den.com> - Jean II */ | 277 | * Thanks to h1kari <h1kari AT dachb0den.com> - Jean II */ |
@@ -285,7 +285,7 @@ struct agere_scan_apinfo { | |||
285 | /* bits: 0-ess, 1-ibss, 4-privacy [wep] */ | 285 | /* bits: 0-ess, 1-ibss, 4-privacy [wep] */ |
286 | __le16 essid_len; /* ESSID length */ | 286 | __le16 essid_len; /* ESSID length */ |
287 | u8 essid[32]; /* ESSID of the network */ | 287 | u8 essid[32]; /* ESSID of the network */ |
288 | } __attribute__ ((packed)); | 288 | } __packed; |
289 | 289 | ||
290 | /* Moustafa: Scan structure for Symbol cards */ | 290 | /* Moustafa: Scan structure for Symbol cards */ |
291 | struct symbol_scan_apinfo { | 291 | struct symbol_scan_apinfo { |
@@ -303,7 +303,7 @@ struct symbol_scan_apinfo { | |||
303 | __le16 basic_rates; /* Basic rates bitmask */ | 303 | __le16 basic_rates; /* Basic rates bitmask */ |
304 | u8 unknown2[6]; /* Always FF:FF:FF:FF:00:00 */ | 304 | u8 unknown2[6]; /* Always FF:FF:FF:FF:00:00 */ |
305 | u8 unknown3[8]; /* Always 0, appeared in f/w 3.91-68 */ | 305 | u8 unknown3[8]; /* Always 0, appeared in f/w 3.91-68 */ |
306 | } __attribute__ ((packed)); | 306 | } __packed; |
307 | 307 | ||
308 | union hermes_scan_info { | 308 | union hermes_scan_info { |
309 | struct agere_scan_apinfo a; | 309 | struct agere_scan_apinfo a; |
@@ -343,7 +343,7 @@ struct agere_ext_scan_info { | |||
343 | __le16 beacon_interval; | 343 | __le16 beacon_interval; |
344 | __le16 capabilities; | 344 | __le16 capabilities; |
345 | u8 data[0]; | 345 | u8 data[0]; |
346 | } __attribute__ ((packed)); | 346 | } __packed; |
347 | 347 | ||
348 | #define HERMES_LINKSTATUS_NOT_CONNECTED (0x0000) | 348 | #define HERMES_LINKSTATUS_NOT_CONNECTED (0x0000) |
349 | #define HERMES_LINKSTATUS_CONNECTED (0x0001) | 349 | #define HERMES_LINKSTATUS_CONNECTED (0x0001) |
@@ -355,7 +355,7 @@ struct agere_ext_scan_info { | |||
355 | 355 | ||
356 | struct hermes_linkstatus { | 356 | struct hermes_linkstatus { |
357 | __le16 linkstatus; /* Link status */ | 357 | __le16 linkstatus; /* Link status */ |
358 | } __attribute__ ((packed)); | 358 | } __packed; |
359 | 359 | ||
360 | struct hermes_response { | 360 | struct hermes_response { |
361 | u16 status, resp0, resp1, resp2; | 361 | u16 status, resp0, resp1, resp2; |
@@ -365,11 +365,11 @@ struct hermes_response { | |||
365 | struct hermes_idstring { | 365 | struct hermes_idstring { |
366 | __le16 len; | 366 | __le16 len; |
367 | __le16 val[16]; | 367 | __le16 val[16]; |
368 | } __attribute__ ((packed)); | 368 | } __packed; |
369 | 369 | ||
370 | struct hermes_multicast { | 370 | struct hermes_multicast { |
371 | u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN]; | 371 | u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN]; |
372 | } __attribute__ ((packed)); | 372 | } __packed; |
373 | 373 | ||
374 | /* Timeouts */ | 374 | /* Timeouts */ |
375 | #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */ | 375 | #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */ |