Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205571
b: refs/heads/master
c: cb016cc
h: refs/heads/master
i:
  205569: e69725c
  205567: 032564f
v: v3
  • Loading branch information
Adam Latham authored and Greg Kroah-Hartman committed Jun 18, 2010
1 parent 7adb2d8 commit 082ec35
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 15f0beb16937acef2bbfd1d7541612c2e7b0d37c
refs/heads/master: cb016cc48a011cbe23c4c742a577108853b66e3f
22 changes: 11 additions & 11 deletions trunk/drivers/staging/winbond/mac_structures.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,28 +98,28 @@
#define ELEMENT_ID_CF_PARAMETER_SET 4
#define ELEMENT_ID_TIM 5
#define ELEMENT_ID_IBSS_PARAMETER_SET 6
// 7~15 reserverd
/* 7~15 reserverd */
#define ELEMENT_ID_CHALLENGE_TEXT 16
// 17~31 reserved for challenge text extension
// 32~255 reserved
//-- 11G --
/* 17~31 reserved for challenge text extension */
/* 32~255 reserved */
/*-- 11G -- */
#define ELEMENT_ID_ERP_INFORMATION 42
#define ELEMENT_ID_EXTENDED_SUPPORTED_RATES 50

//-- WPA --
/* -- WPA -- */

#define ELEMENT_ID_RSN_WPA 221
#ifdef _WPA2_
#define ELEMENT_ID_RSN_WPA2 48
#endif //endif WPA2
#endif /* endif WPA2 */

#define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6)
#define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2)

//===================================================================
// Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
// length of ReasonCode is 2 Octs.
//===================================================================
/* ===================================================================
* Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
* length of ReasonCode is 2 Octs.
* =================================================================== */
#define REASON_REASERED 0
#define REASON_UNSPECIDIED 1
#define REASON_PREAUTH_INVALID 2
Expand Down Expand Up @@ -433,7 +433,7 @@ struct suite_selector
};
};

//-- WPA --
/* -- WPA -- */
struct RSN_Information_Element
{
u8 Element_ID;
Expand Down

0 comments on commit 082ec35

Please sign in to comment.