diff options
author | Ruslan Pisarev <ruslan@rpisarev.org.ua> | 2010-03-20 10:29:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:35:48 -0400 |
commit | 03a4389c808a552abb734483310b52140491ed00 (patch) | |
tree | 67368bc6560982eedd637389594f52a07929137b /drivers/staging/winbond | |
parent | 5dcf8f668c330e72bf3a1de9e8b9451912a68ccd (diff) |
Staging: winbond: fix comments coding style issue in mac_structures.h
This is a patch to the mac_structures.h file that fixed up a comments
Errors found by the checkpatch.pl tool
Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r-- | drivers/staging/winbond/mac_structures.h | 156 |
1 files changed, 78 insertions, 78 deletions
diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h index f24dbb955bf..80d7e4a8899 100644 --- a/drivers/staging/winbond/mac_structures.h +++ b/drivers/staging/winbond/mac_structures.h | |||
@@ -1,4 +1,4 @@ | |||
1 | //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 1 | /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2 | // MAC_Structures.h | 2 | // MAC_Structures.h |
3 | // | 3 | // |
4 | // This file contains the definitions and data structures used by SW-MAC. | 4 | // This file contains the definitions and data structures used by SW-MAC. |
@@ -16,24 +16,24 @@ | |||
16 | // Deleted some unused. | 16 | // Deleted some unused. |
17 | // 20021129 PD43 Austin | 17 | // 20021129 PD43 Austin |
18 | // 20030617 increase the 802.11g definition | 18 | // 20030617 increase the 802.11g definition |
19 | //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 19 | //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
20 | 20 | ||
21 | #ifndef _MAC_Structures_H_ | 21 | #ifndef _MAC_Structures_H_ |
22 | #define _MAC_Structures_H_ | 22 | #define _MAC_Structures_H_ |
23 | 23 | ||
24 | #include <linux/skbuff.h> | 24 | #include <linux/skbuff.h> |
25 | 25 | ||
26 | //========================================================= | 26 | /*========================================================= |
27 | // Some miscellaneous definitions | 27 | // Some miscellaneous definitions |
28 | //----- | 28 | //-----*/ |
29 | #define MAX_CHANNELS 30 | 29 | #define MAX_CHANNELS 30 |
30 | #define MAC_ADDR_LENGTH 6 | 30 | #define MAC_ADDR_LENGTH 6 |
31 | #define MAX_WEP_KEY_SIZE 16 // 128 bits | 31 | #define MAX_WEP_KEY_SIZE 16 /* 128 bits */ |
32 | #define MAX_802_11_FRAGMENT_NUMBER 10 // By spec | 32 | #define MAX_802_11_FRAGMENT_NUMBER 10 /* By spec */ |
33 | 33 | ||
34 | //======================================================== | 34 | /* ======================================================== |
35 | // 802.11 Frame define | 35 | // 802.11 Frame define |
36 | //----- | 36 | //----- */ |
37 | #define MASK_PROTOCOL_VERSION_TYPE 0x0F | 37 | #define MASK_PROTOCOL_VERSION_TYPE 0x0F |
38 | #define MASK_FRAGMENT_NUMBER 0x000F | 38 | #define MASK_FRAGMENT_NUMBER 0x000F |
39 | #define SEQUENCE_NUMBER_SHIFT 4 | 39 | #define SEQUENCE_NUMBER_SHIFT 4 |
@@ -41,8 +41,8 @@ | |||
41 | #define DOT_11_MAC_HEADER_SIZE 24 | 41 | #define DOT_11_MAC_HEADER_SIZE 24 |
42 | #define DOT_11_SNAP_SIZE 6 | 42 | #define DOT_11_SNAP_SIZE 6 |
43 | #define DOT_11_DURATION_OFFSET 2 | 43 | #define DOT_11_DURATION_OFFSET 2 |
44 | #define DOT_11_SEQUENCE_OFFSET 22 //Sequence control offset | 44 | #define DOT_11_SEQUENCE_OFFSET 22 /* Sequence control offset */ |
45 | #define DOT_11_TYPE_OFFSET 30 //The start offset of 802.11 Frame// | 45 | #define DOT_11_TYPE_OFFSET 30 /* The start offset of 802.11 Frame// */ |
46 | #define DOT_11_DATA_OFFSET 24 | 46 | #define DOT_11_DATA_OFFSET 24 |
47 | #define DOT_11_DA_OFFSET 4 | 47 | #define DOT_11_DA_OFFSET 4 |
48 | #define DOT_3_TYPE_ARP 0x80F3 | 48 | #define DOT_3_TYPE_ARP 0x80F3 |
@@ -54,7 +54,7 @@ | |||
54 | #define MAX_ETHERNET_PACKET_SIZE 1514 | 54 | #define MAX_ETHERNET_PACKET_SIZE 1514 |
55 | 55 | ||
56 | 56 | ||
57 | //----- management : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) | 57 | /* ----- management : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ |
58 | #define MAC_SUBTYPE_MNGMNT_ASSOC_REQUEST 0x00 | 58 | #define MAC_SUBTYPE_MNGMNT_ASSOC_REQUEST 0x00 |
59 | #define MAC_SUBTYPE_MNGMNT_ASSOC_RESPONSE 0x10 | 59 | #define MAC_SUBTYPE_MNGMNT_ASSOC_RESPONSE 0x10 |
60 | #define MAC_SUBTYPE_MNGMNT_REASSOC_REQUEST 0x20 | 60 | #define MAC_SUBTYPE_MNGMNT_REASSOC_REQUEST 0x20 |
@@ -67,7 +67,7 @@ | |||
67 | #define MAC_SUBTYPE_MNGMNT_AUTHENTICATION 0xB0 | 67 | #define MAC_SUBTYPE_MNGMNT_AUTHENTICATION 0xB0 |
68 | #define MAC_SUBTYPE_MNGMNT_DEAUTHENTICATION 0xC0 | 68 | #define MAC_SUBTYPE_MNGMNT_DEAUTHENTICATION 0xC0 |
69 | 69 | ||
70 | //----- control : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) | 70 | /* ----- control : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ |
71 | #define MAC_SUBTYPE_CONTROL_PSPOLL 0xA4 | 71 | #define MAC_SUBTYPE_CONTROL_PSPOLL 0xA4 |
72 | #define MAC_SUBTYPE_CONTROL_RTS 0xB4 | 72 | #define MAC_SUBTYPE_CONTROL_RTS 0xB4 |
73 | #define MAC_SUBTYPE_CONTROL_CTS 0xC4 | 73 | #define MAC_SUBTYPE_CONTROL_CTS 0xC4 |
@@ -75,7 +75,7 @@ | |||
75 | #define MAC_SUBTYPE_CONTROL_CFEND 0xE4 | 75 | #define MAC_SUBTYPE_CONTROL_CFEND 0xE4 |
76 | #define MAC_SUBTYPE_CONTROL_CFEND_CFACK 0xF4 | 76 | #define MAC_SUBTYPE_CONTROL_CFEND_CFACK 0xF4 |
77 | 77 | ||
78 | //----- data : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) | 78 | /* ----- data : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ |
79 | #define MAC_SUBTYPE_DATA 0x08 | 79 | #define MAC_SUBTYPE_DATA 0x08 |
80 | #define MAC_SUBTYPE_DATA_CFACK 0x18 | 80 | #define MAC_SUBTYPE_DATA_CFACK 0x18 |
81 | #define MAC_SUBTYPE_DATA_CFPOLL 0x28 | 81 | #define MAC_SUBTYPE_DATA_CFPOLL 0x28 |
@@ -85,12 +85,12 @@ | |||
85 | #define MAC_SUBTYPE_DATA_CFPOLL_NULL 0x68 | 85 | #define MAC_SUBTYPE_DATA_CFPOLL_NULL 0x68 |
86 | #define MAC_SUBTYPE_DATA_CFACK_CFPOLL_NULL 0x78 | 86 | #define MAC_SUBTYPE_DATA_CFACK_CFPOLL_NULL 0x78 |
87 | 87 | ||
88 | //----- Frame Type of Bits (2, 3) | 88 | /* ----- Frame Type of Bits (2, 3) */ |
89 | #define MAC_TYPE_MANAGEMENT 0x00 | 89 | #define MAC_TYPE_MANAGEMENT 0x00 |
90 | #define MAC_TYPE_CONTROL 0x04 | 90 | #define MAC_TYPE_CONTROL 0x04 |
91 | #define MAC_TYPE_DATA 0x08 | 91 | #define MAC_TYPE_DATA 0x08 |
92 | 92 | ||
93 | //----- definitions for Management Frame Element ID (1 BYTE) | 93 | /* ----- definitions for Management Frame Element ID (1 BYTE) */ |
94 | #define ELEMENT_ID_SSID 0 | 94 | #define ELEMENT_ID_SSID 0 |
95 | #define ELEMENT_ID_SUPPORTED_RATES 1 | 95 | #define ELEMENT_ID_SUPPORTED_RATES 1 |
96 | #define ELEMENT_ID_FH_PARAMETER_SET 2 | 96 | #define ELEMENT_ID_FH_PARAMETER_SET 2 |
@@ -130,7 +130,7 @@ | |||
130 | #define REASON_CLASS3_FRAME_FROM_NONASSO_STA 7 | 130 | #define REASON_CLASS3_FRAME_FROM_NONASSO_STA 7 |
131 | #define DISASS_REASON_LEFT_BSS 8 | 131 | #define DISASS_REASON_LEFT_BSS 8 |
132 | #define REASON_NOT_AUTH_YET 9 | 132 | #define REASON_NOT_AUTH_YET 9 |
133 | //802.11i define | 133 | /* 802.11i define */ |
134 | #define REASON_INVALID_IE 13 | 134 | #define REASON_INVALID_IE 13 |
135 | #define REASON_MIC_ERROR 14 | 135 | #define REASON_MIC_ERROR 14 |
136 | #define REASON_4WAY_HANDSHAKE_TIMEOUT 15 | 136 | #define REASON_4WAY_HANDSHAKE_TIMEOUT 15 |
@@ -175,11 +175,11 @@ enum enum_MMPDUResultCode | |||
175 | } WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE; | 175 | } WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE; |
176 | */ | 176 | */ |
177 | 177 | ||
178 | //=========================================================== | 178 | /*=========================================================== |
179 | // enum_TxRate -- | 179 | // enum_TxRate -- |
180 | // Define the transmission constants based on W89C32 MAC | 180 | // Define the transmission constants based on W89C32 MAC |
181 | // target specification. | 181 | // target specification. |
182 | //=========================================================== | 182 | //===========================================================*/ |
183 | typedef enum enum_TxRate | 183 | typedef enum enum_TxRate |
184 | { | 184 | { |
185 | TXRATE_1M = 0, | 185 | TXRATE_1M = 0, |
@@ -189,7 +189,7 @@ typedef enum enum_TxRate | |||
189 | TXRATE_55MSHORT = 5, | 189 | TXRATE_55MSHORT = 5, |
190 | TXRATE_11MLONG = 6, | 190 | TXRATE_11MLONG = 6, |
191 | TXRATE_11MSHORT = 7, | 191 | TXRATE_11MSHORT = 7, |
192 | TXRATE_AUTO = 255 // PD43 20021108 | 192 | TXRATE_AUTO = 255 /* PD43 20021108 */ |
193 | } WB_TXRATE, *PWB_TXRATE; | 193 | } WB_TXRATE, *PWB_TXRATE; |
194 | 194 | ||
195 | 195 | ||
@@ -225,7 +225,7 @@ typedef enum enum_TxRate | |||
225 | #define RATE_54M 108 | 225 | #define RATE_54M 108 |
226 | #define RATE_MAX 255 | 226 | #define RATE_MAX 255 |
227 | 227 | ||
228 | //CAPABILITY | 228 | /* CAPABILITY */ |
229 | #define CAPABILITY_ESS_BIT 0x0001 | 229 | #define CAPABILITY_ESS_BIT 0x0001 |
230 | #define CAPABILITY_IBSS_BIT 0x0002 | 230 | #define CAPABILITY_IBSS_BIT 0x0002 |
231 | #define CAPABILITY_CF_POLL_BIT 0x0004 | 231 | #define CAPABILITY_CF_POLL_BIT 0x0004 |
@@ -243,10 +243,10 @@ struct Capability_Information_Element | |||
243 | union | 243 | union |
244 | { | 244 | { |
245 | u16 __attribute__ ((packed)) wValue; | 245 | u16 __attribute__ ((packed)) wValue; |
246 | #ifdef _BIG_ENDIAN_ //20060926 add by anson's endian | 246 | #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ |
247 | struct _Capability | 247 | struct _Capability |
248 | { | 248 | { |
249 | //-- 11G -- | 249 | /* -- 11G -- */ |
250 | u8 Reserved3 : 2; | 250 | u8 Reserved3 : 2; |
251 | u8 DSSS_OFDM : 1; | 251 | u8 DSSS_OFDM : 1; |
252 | u8 Reserved2 : 2; | 252 | u8 Reserved2 : 2; |
@@ -273,7 +273,7 @@ struct Capability_Information_Element | |||
273 | u8 PBCC : 1; | 273 | u8 PBCC : 1; |
274 | u8 Channel_Agility : 1; | 274 | u8 Channel_Agility : 1; |
275 | u8 Reserved1 : 2; | 275 | u8 Reserved1 : 2; |
276 | //-- 11G -- | 276 | /* -- 11G -- */ |
277 | u8 Short_Slot_Time : 1; | 277 | u8 Short_Slot_Time : 1; |
278 | u8 Reserved2 : 2; | 278 | u8 Reserved2 : 2; |
279 | u8 DSSS_OFDM : 1; | 279 | u8 DSSS_OFDM : 1; |
@@ -320,8 +320,8 @@ struct CF_Parameter_Set_Element | |||
320 | u8 Length; | 320 | u8 Length; |
321 | u8 CFP_Count; | 321 | u8 CFP_Count; |
322 | u8 CFP_Period; | 322 | u8 CFP_Period; |
323 | u8 CFP_MaxDuration[2]; // in Time Units | 323 | u8 CFP_MaxDuration[2]; /* in Time Units */ |
324 | u8 CFP_DurRemaining[2]; // in time units | 324 | u8 CFP_DurRemaining[2]; /* in time units */ |
325 | }; | 325 | }; |
326 | 326 | ||
327 | struct TIM_Element | 327 | struct TIM_Element |
@@ -350,8 +350,8 @@ struct Challenge_Text_Element | |||
350 | 350 | ||
351 | struct PHY_Parameter_Set_Element | 351 | struct PHY_Parameter_Set_Element |
352 | { | 352 | { |
353 | // int aSlotTime; | 353 | /* int aSlotTime; */ |
354 | // int aSifsTime; | 354 | /* int aSifsTime; */ |
355 | s32 aCCATime; | 355 | s32 aCCATime; |
356 | s32 aRxTxTurnaroundTime; | 356 | s32 aRxTxTurnaroundTime; |
357 | s32 aTxPLCPDelay; | 357 | s32 aTxPLCPDelay; |
@@ -367,17 +367,17 @@ struct PHY_Parameter_Set_Element | |||
367 | s32 aPLCPHeaderLength; | 367 | s32 aPLCPHeaderLength; |
368 | s32 aMPDUDurationFactor; | 368 | s32 aMPDUDurationFactor; |
369 | s32 aMPDUMaxLength; | 369 | s32 aMPDUMaxLength; |
370 | // int aCWmin; | 370 | /* int aCWmin; */ |
371 | // int aCWmax; | 371 | /* int aCWmax; */ |
372 | }; | 372 | }; |
373 | 373 | ||
374 | //-- 11G -- | 374 | /* -- 11G -- */ |
375 | struct ERP_Information_Element | 375 | struct ERP_Information_Element |
376 | { | 376 | { |
377 | u8 Element_ID; | 377 | u8 Element_ID; |
378 | u8 Length; | 378 | u8 Length; |
379 | #ifdef _BIG_ENDIAN_ //20060926 add by anson's endian | 379 | #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ |
380 | u8 Reserved:5; //20060926 add by anson | 380 | u8 Reserved:5; /* 20060926 add by anson */ |
381 | u8 Barker_Preamble_Mode:1; | 381 | u8 Barker_Preamble_Mode:1; |
382 | u8 Use_Protection:1; | 382 | u8 Use_Protection:1; |
383 | u8 NonERP_Present:1; | 383 | u8 NonERP_Present:1; |
@@ -396,41 +396,41 @@ struct Extended_Supported_Rates_Element | |||
396 | u8 ExtendedSupportedRates[255]; | 396 | u8 ExtendedSupportedRates[255]; |
397 | }__attribute__ ((packed)); | 397 | }__attribute__ ((packed)); |
398 | 398 | ||
399 | //WPA(802.11i draft 3.0) | 399 | /* WPA(802.11i draft 3.0) */ |
400 | #define VERSION_WPA 1 | 400 | #define VERSION_WPA 1 |
401 | #ifdef _WPA2_ | 401 | #ifdef _WPA2_ |
402 | #define VERSION_WPA2 1 | 402 | #define VERSION_WPA2 1 |
403 | #endif //end def _WPA2_ | 403 | #endif /* end def _WPA2_ */ |
404 | #define OUI_WPA 0x00F25000 //WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type | 404 | #define OUI_WPA 0x00F25000 /* WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type */ |
405 | #ifdef _WPA2_ | 405 | #ifdef _WPA2_ |
406 | #define OUI_WPA2 0x00AC0F00 // for wpa2 change to 0x00ACOF04 by Ws 26/04/04 | 406 | #define OUI_WPA2 0x00AC0F00 /* for wpa2 change to 0x00ACOF04 by Ws 26/04/04 */ |
407 | #endif //end def _WPA2_ | 407 | #endif /* end def _WPA2_ */ |
408 | 408 | ||
409 | #define OUI_WPA_ADDITIONAL 0x01 | 409 | #define OUI_WPA_ADDITIONAL 0x01 |
410 | #define WLAN_MIN_RSN_WPA_LENGTH 6 //added by ws 09/10/04 | 410 | #define WLAN_MIN_RSN_WPA_LENGTH 6 /* added by ws 09/10/04 */ |
411 | #ifdef _WPA2_ | 411 | #ifdef _WPA2_ |
412 | #define WLAN_MIN_RSN_WPA2_LENGTH 2 // Fix to 2 09/14/05 | 412 | #define WLAN_MIN_RSN_WPA2_LENGTH 2 /* Fix to 2 09/14/05 */ |
413 | #endif //end def _WPA2_ | 413 | #endif /* end def _WPA2_ */ |
414 | 414 | ||
415 | #define oui_wpa (u32)(OUI_WPA|OUI_WPA_ADDITIONAL) | 415 | #define oui_wpa (u32)(OUI_WPA|OUI_WPA_ADDITIONAL) |
416 | 416 | ||
417 | #define WPA_OUI_BIG ((u32) 0x01F25000)//added by ws 09/23/04 | 417 | #define WPA_OUI_BIG ((u32) 0x01F25000)/* added by ws 09/23/04 */ |
418 | #define WPA_OUI_LITTLE ((u32) 0x01F25001)//added by ws 09/23/04 | 418 | #define WPA_OUI_LITTLE ((u32) 0x01F25001)/* added by ws 09/23/04 */ |
419 | 419 | ||
420 | #define WPA_WPS_OUI cpu_to_le32(0x04F25000) // 20061108 For WPS. It's little endian. Big endian is 0x0050F204 | 420 | #define WPA_WPS_OUI cpu_to_le32(0x04F25000) /* 20061108 For WPS. It's little endian. Big endian is 0x0050F204 */ |
421 | 421 | ||
422 | //-----WPA2----- | 422 | /* -----WPA2----- */ |
423 | #ifdef _WPA2_ | 423 | #ifdef _WPA2_ |
424 | #define WPA2_OUI_BIG ((u32)0x01AC0F00) | 424 | #define WPA2_OUI_BIG ((u32)0x01AC0F00) |
425 | #define WPA2_OUI_LITTLE ((u32)0x01AC0F01) | 425 | #define WPA2_OUI_LITTLE ((u32)0x01AC0F01) |
426 | #endif //end def _WPA2_ | 426 | #endif /* end def _WPA2_ */ |
427 | 427 | ||
428 | //Authentication suite | 428 | /* Authentication suite */ |
429 | #define OUI_AUTH_WPA_NONE 0x00 //for WPA_NONE | 429 | #define OUI_AUTH_WPA_NONE 0x00 /* for WPA_NONE */ |
430 | #define OUI_AUTH_8021X 0x01 | 430 | #define OUI_AUTH_8021X 0x01 |
431 | #define OUI_AUTH_PSK 0x02 | 431 | #define OUI_AUTH_PSK 0x02 |
432 | //Cipher suite | 432 | /* Cipher suite */ |
433 | #define OUI_CIPHER_GROUP_KEY 0x00 //added by ws 05/21/04 | 433 | #define OUI_CIPHER_GROUP_KEY 0x00 /* added by ws 05/21/04 */ |
434 | #define OUI_CIPHER_WEP_40 0x01 | 434 | #define OUI_CIPHER_WEP_40 0x01 |
435 | #define OUI_CIPHER_TKIP 0x02 | 435 | #define OUI_CIPHER_TKIP 0x02 |
436 | #define OUI_CIPHER_CCMP 0x04 | 436 | #define OUI_CIPHER_CCMP 0x04 |
@@ -466,16 +466,16 @@ struct RSN_Auth_Sub_Information_Element | |||
466 | struct suite_selector AuthKeyMngtSuite[1]; | 466 | struct suite_selector AuthKeyMngtSuite[1]; |
467 | }__attribute__ ((packed)); | 467 | }__attribute__ ((packed)); |
468 | 468 | ||
469 | //-- WPA2 -- | 469 | /* -- WPA2 -- */ |
470 | struct RSN_Capability_Element | 470 | struct RSN_Capability_Element |
471 | { | 471 | { |
472 | union | 472 | union |
473 | { | 473 | { |
474 | u16 __attribute__ ((packed)) wValue; | 474 | u16 __attribute__ ((packed)) wValue; |
475 | #ifdef _BIG_ENDIAN_ //20060927 add by anson's endian | 475 | #ifdef _BIG_ENDIAN_ /* 20060927 add by anson's endian */ |
476 | struct _RSN_Capability | 476 | struct _RSN_Capability |
477 | { | 477 | { |
478 | u16 __attribute__ ((packed)) Reserved2 : 8; // 20051201 | 478 | u16 __attribute__ ((packed)) Reserved2 : 8; /* 20051201 */ |
479 | u16 __attribute__ ((packed)) Reserved1 : 2; | 479 | u16 __attribute__ ((packed)) Reserved1 : 2; |
480 | u16 __attribute__ ((packed)) GTK_Replay_Counter : 2; | 480 | u16 __attribute__ ((packed)) GTK_Replay_Counter : 2; |
481 | u16 __attribute__ ((packed)) PTK_Replay_Counter : 2; | 481 | u16 __attribute__ ((packed)) PTK_Replay_Counter : 2; |
@@ -490,7 +490,7 @@ struct RSN_Capability_Element | |||
490 | u16 __attribute__ ((packed)) PTK_Replay_Counter : 2; | 490 | u16 __attribute__ ((packed)) PTK_Replay_Counter : 2; |
491 | u16 __attribute__ ((packed)) GTK_Replay_Counter : 2; | 491 | u16 __attribute__ ((packed)) GTK_Replay_Counter : 2; |
492 | u16 __attribute__ ((packed)) Reserved1 : 2; | 492 | u16 __attribute__ ((packed)) Reserved1 : 2; |
493 | u16 __attribute__ ((packed)) Reserved2 : 8; // 20051201 | 493 | u16 __attribute__ ((packed)) Reserved2 : 8; /* 20051201 */ |
494 | }__attribute__ ((packed)) RSN_Capability; | 494 | }__attribute__ ((packed)) RSN_Capability; |
495 | #endif | 495 | #endif |
496 | 496 | ||
@@ -527,14 +527,14 @@ struct PMKID_Information_Element | |||
527 | struct pmkid pmkid[16]; | 527 | struct pmkid pmkid[16]; |
528 | }__attribute__ ((packed)); | 528 | }__attribute__ ((packed)); |
529 | 529 | ||
530 | #endif //enddef _WPA2_ | 530 | #endif /* enddef _WPA2_ */ |
531 | //============================================================ | 531 | /*============================================================ |
532 | // MAC Frame structure (different type) and subfield structure | 532 | // MAC Frame structure (different type) and subfield structure |
533 | //============================================================ | 533 | //============================================================*/ |
534 | struct MAC_frame_control | 534 | struct MAC_frame_control |
535 | { | 535 | { |
536 | u8 mac_frame_info; // a combination of the [Protocol Version, Control Type, Control Subtype] | 536 | u8 mac_frame_info; /* a combination of the [Protocol Version, Control Type, Control Subtype]*/ |
537 | #ifdef _BIG_ENDIAN_ //20060927 add by anson's endian | 537 | #ifdef _BIG_ENDIAN_ /* 20060927 add by anson's endian */ |
538 | u8 order:1; | 538 | u8 order:1; |
539 | u8 WEP:1; | 539 | u8 WEP:1; |
540 | u8 more_data:1; | 540 | u8 more_data:1; |
@@ -556,19 +556,19 @@ struct MAC_frame_control | |||
556 | } __attribute__ ((packed)); | 556 | } __attribute__ ((packed)); |
557 | 557 | ||
558 | struct Management_Frame { | 558 | struct Management_Frame { |
559 | struct MAC_frame_control frame_control; // 2B, ToDS,FromDS,MoreFrag,MoreData,Order=0 | 559 | struct MAC_frame_control frame_control; /* 2B, ToDS,FromDS,MoreFrag,MoreData,Order=0 */ |
560 | u16 duration; | 560 | u16 duration; |
561 | u8 DA[MAC_ADDR_LENGTH]; // Addr1 | 561 | u8 DA[MAC_ADDR_LENGTH]; /* Addr1 */ |
562 | u8 SA[MAC_ADDR_LENGTH]; // Addr2 | 562 | u8 SA[MAC_ADDR_LENGTH]; /* Addr2 */ |
563 | u8 BSSID[MAC_ADDR_LENGTH]; // Addr3 | 563 | u8 BSSID[MAC_ADDR_LENGTH]; /* Addr3 */ |
564 | u16 Sequence_Control; | 564 | u16 Sequence_Control; |
565 | // Management Frame Body <= 325 bytes | 565 | /* Management Frame Body <= 325 bytes */ |
566 | // FCS 4 bytes | 566 | /* FCS 4 bytes */ |
567 | }__attribute__ ((packed)); | 567 | }__attribute__ ((packed)); |
568 | 568 | ||
569 | // SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it. | 569 | /* SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it. */ |
570 | struct Control_Frame { | 570 | struct Control_Frame { |
571 | struct MAC_frame_control frame_control; // ToDS,FromDS,MoreFrag,Retry,MoreData,WEP,Order=0 | 571 | struct MAC_frame_control frame_control; /* ToDS,FromDS,MoreFrag,Retry,MoreData,WEP,Order=0 */ |
572 | u16 duration; | 572 | u16 duration; |
573 | u8 RA[MAC_ADDR_LENGTH]; | 573 | u8 RA[MAC_ADDR_LENGTH]; |
574 | u8 TA[MAC_ADDR_LENGTH]; | 574 | u8 TA[MAC_ADDR_LENGTH]; |
@@ -582,9 +582,9 @@ struct Data_Frame { | |||
582 | u8 Addr2[MAC_ADDR_LENGTH]; | 582 | u8 Addr2[MAC_ADDR_LENGTH]; |
583 | u8 Addr3[MAC_ADDR_LENGTH]; | 583 | u8 Addr3[MAC_ADDR_LENGTH]; |
584 | u16 Sequence_Control; | 584 | u16 Sequence_Control; |
585 | u8 Addr4[MAC_ADDR_LENGTH]; // only exist when ToDS=FromDS=1 | 585 | u8 Addr4[MAC_ADDR_LENGTH]; /* only exist when ToDS=FromDS=1 */ |
586 | // Data Frame Body <= 2312 | 586 | /* Data Frame Body <= 2312 */ |
587 | // FCS | 587 | /* FCS */ |
588 | }__attribute__ ((packed)); | 588 | }__attribute__ ((packed)); |
589 | 589 | ||
590 | struct Disassociation_Frame_Body | 590 | struct Disassociation_Frame_Body |
@@ -596,9 +596,9 @@ struct Association_Request_Frame_Body | |||
596 | { | 596 | { |
597 | u16 capability_information; | 597 | u16 capability_information; |
598 | u16 listenInterval; | 598 | u16 listenInterval; |
599 | u8 Current_AP_Address[MAC_ADDR_LENGTH];//for reassociation only | 599 | u8 Current_AP_Address[MAC_ADDR_LENGTH];/* for reassociation only */ |
600 | // SSID (2+32 bytes) | 600 | /* SSID (2+32 bytes) */ |
601 | // Supported_Rates (2+8 bytes) | 601 | /* Supported_Rates (2+8 bytes) */ |
602 | }__attribute__ ((packed)); | 602 | }__attribute__ ((packed)); |
603 | 603 | ||
604 | struct Association_Response_Frame_Body | 604 | struct Association_Response_Frame_Body |
@@ -617,7 +617,7 @@ struct Association_Response_Frame_Body | |||
617 | // SSID (2+32 bytes) | 617 | // SSID (2+32 bytes) |
618 | // Supported_Rates (2+8 bytes) | 618 | // Supported_Rates (2+8 bytes) |
619 | };*/ | 619 | };*/ |
620 | // eliminated by WS 07/22/04 comboined with associateion request frame. | 620 | /* eliminated by WS 07/22/04 comboined with associateion request frame. */ |
621 | 621 | ||
622 | struct Reassociation_Response_Frame_Body | 622 | struct Reassociation_Response_Frame_Body |
623 | { | 623 | { |
@@ -638,11 +638,11 @@ struct Probe_Response_Frame_Body | |||
638 | u16 Timestamp; | 638 | u16 Timestamp; |
639 | u16 Beacon_Interval; | 639 | u16 Beacon_Interval; |
640 | u16 Capability_Information; | 640 | u16 Capability_Information; |
641 | // SSID | 641 | /* SSID |
642 | // Supported_Rates | 642 | // Supported_Rates |
643 | // PHY parameter Set (DS Parameters) | 643 | // PHY parameter Set (DS Parameters) |
644 | // CF parameter Set | 644 | // CF parameter Set |
645 | // IBSS parameter Set | 645 | // IBSS parameter Set */ |
646 | }__attribute__ ((packed)); | 646 | }__attribute__ ((packed)); |
647 | 647 | ||
648 | struct Authentication_Frame_Body | 648 | struct Authentication_Frame_Body |
@@ -650,11 +650,11 @@ struct Authentication_Frame_Body | |||
650 | u16 algorithmNumber; | 650 | u16 algorithmNumber; |
651 | u16 sequenceNumber; | 651 | u16 sequenceNumber; |
652 | u16 statusCode; | 652 | u16 statusCode; |
653 | // NB: don't include ChallengeText in this structure | 653 | /* NB: don't include ChallengeText in this structure |
654 | // struct Challenge_Text_Element sChallengeTextElement; // wkchen added | 654 | // struct Challenge_Text_Element sChallengeTextElement; // wkchen added */ |
655 | }__attribute__ ((packed)); | 655 | }__attribute__ ((packed)); |
656 | 656 | ||
657 | 657 | ||
658 | #endif // _MAC_Structure_H_ | 658 | #endif /* _MAC_Structure_H_ */ |
659 | 659 | ||
660 | 660 | ||