diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-17 20:40:24 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 00:48:34 +0300 |
| commit | 7e810011201bf926cba09ec07424893e4cd8ce67 (patch) | |
| tree | 202fc7a42607e366848ca59c7a61a8f9fa2712ca /target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h | |
| parent | a45894b5a0f65585440d98bf71ef3e919c84cb5f (diff) | |
Move to rsdk 3.2.4. Compiles cleanly.
Signed-off-by: Roman Yeryomin <roman@advem.lv>
Diffstat (limited to 'target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h')
| -rw-r--r-- | target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h b/target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h index b0801e360..d643b3dea 100644 --- a/target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h +++ b/target/linux/realtek/files/drivers/net/wireless/rtl8192cd/8192cd_security.h @@ -169,13 +169,7 @@ typedef enum{ DOT11_EVENT_WSC_PROBE_REQ_IND = 56, DOT11_EVENT_WSC_PIN_IND = 57, DOT11_EVENT_WSC_ASSOC_REQ_IE_IND = 58, - /* WPS2DOTX */ - /* support Assigned MAC Addr,Assigned SSID,dymanic change STA's PIN code, 2011-0505 */ - DOT11_EVENT_WSC_SET_MY_PIN = 102, - DOT11_EVENT_WSC_SPEC_SSID = 103, - DOT11_EVENT_WSC_SPEC_MAC_IND = 104, - /* support Assigned MAC Addr,Assigned SSID,dymanic change STA's PIN code, 2011-0505 */ - /* WPS2DOTX */ + #ifdef INCLUDE_WPS @@ -205,15 +199,17 @@ typedef enum{ DOT11_EVENT_WSC_PUTWLREQ_PROBEIND = 88, DOT11_EVENT_WSC_PUTWLREQ_STATUSIND = 89, #endif -#ifdef CONFIG_RTL_COMAPI_CFGFILE - DOT11_EVENT_WSC_START_IND = 90, - //EV_MODE, EV_STATUS, EV_MEHOD, EV_STEP, EV_OOB - DOT11_EVENT_WSC_MODE_IND = 91, - DOT11_EVENT_WSC_STATUS_IND = 92, - DOT11_EVENT_WSC_METHOD_IND = 93, - DOT11_EVENT_WSC_STEP_IND = 94, - DOT11_EVENT_WSC_OOB_IND = 95, + +#ifdef P2P_SUPPORT + DOT11_EVENT_WSC_SWITCH_MODE = 100, + DOT11_EVENT_WSC_STOP = 101, #endif + /* support Assigned MAC Addr,Assigned SSID,dymanic change STA's PIN code, 2011-0505 */ + DOT11_EVENT_WSC_SET_MY_PIN = 102, + DOT11_EVENT_WSC_SPEC_SSID = 103, + DOT11_EVENT_WSC_SPEC_MAC_IND = 104, + /* support Assigned MAC Addr,Assigned SSID,dymanic change STA's PIN code, 2011-0505 */ + #endif #ifdef CONFIG_RTK_MESH DOT11_EVENT_PATHSEL_GEN_RREQ = 59, @@ -231,6 +227,15 @@ typedef enum{ DOT11_EVENT_WAPI_WRITE_QUEUE =69, #endif #if defined(CONFIG_RTL_COMAPI_CFGFILE) && defined(WIFI_SIMPLE_CONFIG) +#ifdef INCLUDE_WPS + DOT11_EVENT_WSC_START_IND = 90, + //EV_MODE, EV_STATUS, EV_MEHOD, EV_STEP, EV_OOB + DOT11_EVENT_WSC_MODE_IND = 91, + DOT11_EVENT_WSC_STATUS_IND = 92, + DOT11_EVENT_WSC_METHOD_IND = 93, + DOT11_EVENT_WSC_STEP_IND = 94, + DOT11_EVENT_WSC_OOB_IND = 95, +#else DOT11_EVENT_WSC_START_IND = 70, //EV_MODE, EV_STATUS, EV_MEHOD, EV_STEP, EV_OOB DOT11_EVENT_WSC_MODE_IND = 71, @@ -240,6 +245,8 @@ typedef enum{ DOT11_EVENT_WSC_OOB_IND = 75, #endif +#endif + } DOT11_EVENT; #ifdef WIFI_SIMPLE_CONFIG @@ -611,7 +618,7 @@ typedef enum _COUNTERMEASURE_TEST #define IsPreAuthentication(Cap) ((Cap[0] & 0x01)?TRUE:FALSE) #define DOT11_GetNumOfRxTSC(Cap) (2<<((Cap[0] >> DOT11_REPLAYBITSSHIFT) & DOT11_REPLAYBITS)) -#if defined(PACK_STRUCTURE) +#if defined(PACK_STRUCTURE) || defined(__ECOS) #pragma pack(1) #endif @@ -662,7 +669,7 @@ typedef union _DOT11_RSN_CAPABILITY{ }DOT11_RSN_CAPABILITY; -#if defined(PACK_STRUCTURE) +#if defined(PACK_STRUCTURE) || defined(__ECOS) #pragma pack() #endif |