diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-26 10:05:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:47 -0400 |
commit | f3a9749f8d5ce80e4d588b424d36aa60cbf40091 (patch) | |
tree | 5b1ff3880284110d57b12a73dffb91ccb06c8326 /drivers | |
parent | e08bae5ab24ee8c34e6b0c5197136af77ae12275 (diff) |
Staging: rt2870: remove WPA_SUPPLICANT_SUPPORT ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rt2870/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/rt2870/common/cmm_wpa.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/common/mlme.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/common/rtmp_init.c | 3 | ||||
-rw-r--r-- | drivers/staging/rt2870/oid.h | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt2870.h | 7 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt_config.h | 4 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt_profile.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/rtmp.h | 4 | ||||
-rw-r--r-- | drivers/staging/rt2870/sta/connect.c | 10 | ||||
-rw-r--r-- | drivers/staging/rt2870/sta/rtmp_data.c | 10 | ||||
-rw-r--r-- | drivers/staging/rt2870/sta/wpa.c | 3 | ||||
-rw-r--r-- | drivers/staging/rt2870/sta_ioctl.c | 52 |
13 files changed, 5 insertions, 97 deletions
diff --git a/drivers/staging/rt2870/Makefile b/drivers/staging/rt2870/Makefile index de79796d2ba..31ed4802294 100644 --- a/drivers/staging/rt2870/Makefile +++ b/drivers/staging/rt2870/Makefile | |||
@@ -5,7 +5,6 @@ EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT | |||
5 | EXTRA_CFLAGS += -DRT2870 | 5 | EXTRA_CFLAGS += -DRT2870 |
6 | EXTRA_CFLAGS += -DDBG | 6 | EXTRA_CFLAGS += -DDBG |
7 | EXTRA_CFLAGS += -DDOT11_N_SUPPORT | 7 | EXTRA_CFLAGS += -DDOT11_N_SUPPORT |
8 | EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT | ||
9 | 8 | ||
10 | rt2870sta-objs := \ | 9 | rt2870sta-objs := \ |
11 | common/md5.o \ | 10 | common/md5.o \ |
diff --git a/drivers/staging/rt2870/common/cmm_wpa.c b/drivers/staging/rt2870/common/cmm_wpa.c index 076568e0c26..c9a6f842e2b 100644 --- a/drivers/staging/rt2870/common/cmm_wpa.c +++ b/drivers/staging/rt2870/common/cmm_wpa.c | |||
@@ -625,14 +625,12 @@ VOID RTMPMakeRSNIE( | |||
625 | { | 625 | { |
626 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 626 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
627 | { | 627 | { |
628 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
629 | if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) | 628 | if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) |
630 | { | 629 | { |
631 | if (AuthMode < Ndis802_11AuthModeWPA) | 630 | if (AuthMode < Ndis802_11AuthModeWPA) |
632 | return; | 631 | return; |
633 | } | 632 | } |
634 | else | 633 | else |
635 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
636 | { | 634 | { |
637 | // Support WPAPSK or WPA2PSK in STA-Infra mode | 635 | // Support WPAPSK or WPA2PSK in STA-Infra mode |
638 | // Support WPANone in STA-Adhoc mode | 636 | // Support WPANone in STA-Adhoc mode |
diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c index f669e8501c1..b8e9db559b7 100644 --- a/drivers/staging/rt2870/common/mlme.c +++ b/drivers/staging/rt2870/common/mlme.c | |||
@@ -939,9 +939,7 @@ VOID STAMlmePeriodicExec( | |||
939 | ULONG TxTotalCnt; | 939 | ULONG TxTotalCnt; |
940 | int i; | 940 | int i; |
941 | 941 | ||
942 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
943 | if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE) | 942 | if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE) |
944 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
945 | { | 943 | { |
946 | // WPA MIC error should block association attempt for 60 seconds | 944 | // WPA MIC error should block association attempt for 60 seconds |
947 | if (pAd->StaCfg.bBlockAssoc && (pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ) < pAd->Mlme.Now32)) | 945 | if (pAd->StaCfg.bBlockAssoc && (pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ) < pAd->Mlme.Now32)) |
diff --git a/drivers/staging/rt2870/common/rtmp_init.c b/drivers/staging/rt2870/common/rtmp_init.c index 06cc2a14c88..27cbb479327 100644 --- a/drivers/staging/rt2870/common/rtmp_init.c +++ b/drivers/staging/rt2870/common/rtmp_init.c | |||
@@ -3316,13 +3316,10 @@ VOID UserCfgInit( | |||
3316 | NdisZeroMemory(pAd->nickname, IW_ESSID_MAX_SIZE+1); | 3316 | NdisZeroMemory(pAd->nickname, IW_ESSID_MAX_SIZE+1); |
3317 | sprintf(pAd->nickname, "%s", STA_NIC_DEVICE_NAME); | 3317 | sprintf(pAd->nickname, "%s", STA_NIC_DEVICE_NAME); |
3318 | RTMPInitTimer(pAd, &pAd->StaCfg.WpaDisassocAndBlockAssocTimer, GET_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc), pAd, FALSE); | 3318 | RTMPInitTimer(pAd, &pAd->StaCfg.WpaDisassocAndBlockAssocTimer, GET_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc), pAd, FALSE); |
3319 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
3320 | pAd->StaCfg.IEEE8021X = FALSE; | 3319 | pAd->StaCfg.IEEE8021X = FALSE; |
3321 | pAd->StaCfg.IEEE8021x_required_keys = FALSE; | 3320 | pAd->StaCfg.IEEE8021x_required_keys = FALSE; |
3322 | pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE; | 3321 | pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_DISABLE; |
3323 | pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE; | 3322 | pAd->StaCfg.WpaSupplicantUP = WPA_SUPPLICANT_ENABLE; |
3324 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
3325 | |||
3326 | } | 3323 | } |
3327 | 3324 | ||
3328 | // Default for extra information is not valid | 3325 | // Default for extra information is not valid |
diff --git a/drivers/staging/rt2870/oid.h b/drivers/staging/rt2870/oid.h index 5c392b2a4f5..cdd9c193581 100644 --- a/drivers/staging/rt2870/oid.h +++ b/drivers/staging/rt2870/oid.h | |||
@@ -157,7 +157,7 @@ | |||
157 | #define RT_OID_802_11_QUERY_LAST_RX_RATE 0x0613 | 157 | #define RT_OID_802_11_QUERY_LAST_RX_RATE 0x0613 |
158 | #define RT_OID_802_11_TX_POWER_LEVEL_1 0x0614 | 158 | #define RT_OID_802_11_TX_POWER_LEVEL_1 0x0614 |
159 | #define RT_OID_802_11_QUERY_PIDVID 0x0615 | 159 | #define RT_OID_802_11_QUERY_PIDVID 0x0615 |
160 | //for WPA_SUPPLICANT_SUPPORT | 160 | |
161 | #define OID_SET_COUNTERMEASURES 0x0616 | 161 | #define OID_SET_COUNTERMEASURES 0x0616 |
162 | #define OID_802_11_SET_IEEE8021X 0x0617 | 162 | #define OID_802_11_SET_IEEE8021X 0x0617 |
163 | #define OID_802_11_SET_IEEE8021X_REQUIRE_KEY 0x0618 | 163 | #define OID_802_11_SET_IEEE8021X_REQUIRE_KEY 0x0618 |
diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index 39f66c3243b..d6c0595423d 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h | |||
@@ -608,13 +608,6 @@ typedef struct _CmdQ { | |||
608 | UINT32 CmdQState; | 608 | UINT32 CmdQState; |
609 | }CmdQ, *PCmdQ; | 609 | }CmdQ, *PCmdQ; |
610 | 610 | ||
611 | // | ||
612 | // For WPA SUPPLICANT: WIRELESS EXT support wireless events: v14 or newer | ||
613 | // | ||
614 | #if WIRELESS_EXT >= 14 | ||
615 | //#define WPA_SUPPLICANT_SUPPORT 1 | ||
616 | #endif | ||
617 | |||
618 | /* oid.h */ | 611 | /* oid.h */ |
619 | // Cipher suite type for mixed mode group cipher, P802.11i-2004 | 612 | // Cipher suite type for mixed mode group cipher, P802.11i-2004 |
620 | typedef enum _RT_802_11_CIPHER_SUITE_TYPE { | 613 | typedef enum _RT_802_11_CIPHER_SUITE_TYPE { |
diff --git a/drivers/staging/rt2870/rt_config.h b/drivers/staging/rt2870/rt_config.h index 90b1d19302b..09e76759f88 100644 --- a/drivers/staging/rt2870/rt_config.h +++ b/drivers/staging/rt2870/rt_config.h | |||
@@ -67,10 +67,6 @@ | |||
67 | #include "igmp_snoop.h" | 67 | #include "igmp_snoop.h" |
68 | #endif // IGMP_SNOOP_SUPPORT // | 68 | #endif // IGMP_SNOOP_SUPPORT // |
69 | 69 | ||
70 | #ifndef WPA_SUPPLICANT_SUPPORT | ||
71 | #error "Build for being controlled by NetworkManager or wext, please set HAS_WPA_SUPPLICANT=y" | ||
72 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
73 | |||
74 | #ifdef IKANOS_VX_1X0 | 70 | #ifdef IKANOS_VX_1X0 |
75 | #include "vr_ikans.h" | 71 | #include "vr_ikans.h" |
76 | #endif // IKANOS_VX_1X0 // | 72 | #endif // IKANOS_VX_1X0 // |
diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c index c96db98242f..99e2364c96d 100644 --- a/drivers/staging/rt2870/rt_profile.c +++ b/drivers/staging/rt2870/rt_profile.c | |||
@@ -1277,12 +1277,10 @@ NDIS_STATUS RTMPReadParametersHook( | |||
1277 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPANone; | 1277 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPANone; |
1278 | else if ((strcmp(tmpbuf, "WPA2PSK") == 0) || (strcmp(tmpbuf, "wpa2psk") == 0)) | 1278 | else if ((strcmp(tmpbuf, "WPA2PSK") == 0) || (strcmp(tmpbuf, "wpa2psk") == 0)) |
1279 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; | 1279 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; |
1280 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1281 | else if ((strcmp(tmpbuf, "WPA") == 0) || (strcmp(tmpbuf, "wpa") == 0)) | 1280 | else if ((strcmp(tmpbuf, "WPA") == 0) || (strcmp(tmpbuf, "wpa") == 0)) |
1282 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA; | 1281 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA; |
1283 | else if ((strcmp(tmpbuf, "WPA2") == 0) || (strcmp(tmpbuf, "wpa2") == 0)) | 1282 | else if ((strcmp(tmpbuf, "WPA2") == 0) || (strcmp(tmpbuf, "wpa2") == 0)) |
1284 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; | 1283 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; |
1285 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1286 | else | 1284 | else |
1287 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeOpen; | 1285 | pAd->StaCfg.AuthMode = Ndis802_11AuthModeOpen; |
1288 | 1286 | ||
diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h index 331ebeb4924..7bb226f0e79 100644 --- a/drivers/staging/rt2870/rtmp.h +++ b/drivers/staging/rt2870/rtmp.h | |||
@@ -1949,7 +1949,6 @@ typedef struct _STA_ADMIN_CONFIG { | |||
1949 | BOOLEAN bFastRoaming; // 0:disable fast roaming, 1:enable fast roaming | 1949 | BOOLEAN bFastRoaming; // 0:disable fast roaming, 1:enable fast roaming |
1950 | CHAR dBmToRoam; // the condition to roam when receiving Rssi less than this value. It's negative value. | 1950 | CHAR dBmToRoam; // the condition to roam when receiving Rssi less than this value. It's negative value. |
1951 | 1951 | ||
1952 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1953 | BOOLEAN IEEE8021X; | 1952 | BOOLEAN IEEE8021X; |
1954 | BOOLEAN IEEE8021x_required_keys; | 1953 | BOOLEAN IEEE8021x_required_keys; |
1955 | CIPHER_KEY DesireSharedKey[4]; // Record user desired WEP keys | 1954 | CIPHER_KEY DesireSharedKey[4]; // Record user desired WEP keys |
@@ -1960,7 +1959,6 @@ typedef struct _STA_ADMIN_CONFIG { | |||
1960 | // 2: driver takes care of scanning, AP selection, and IEEE 802.11 association parameters | 1959 | // 2: driver takes care of scanning, AP selection, and IEEE 802.11 association parameters |
1961 | UCHAR WpaSupplicantUP; | 1960 | UCHAR WpaSupplicantUP; |
1962 | UCHAR WpaSupplicantScanCount; | 1961 | UCHAR WpaSupplicantScanCount; |
1963 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1964 | 1962 | ||
1965 | CHAR dev_name[16]; | 1963 | CHAR dev_name[16]; |
1966 | USHORT OriDevType; | 1964 | USHORT OriDevType; |
@@ -5851,7 +5849,6 @@ VOID QueryBATABLE( | |||
5851 | OUT PQUERYBA_TABLE pBAT); | 5849 | OUT PQUERYBA_TABLE pBAT); |
5852 | #endif // DOT11_N_SUPPORT // | 5850 | #endif // DOT11_N_SUPPORT // |
5853 | 5851 | ||
5854 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
5855 | INT WpaCheckEapCode( | 5852 | INT WpaCheckEapCode( |
5856 | IN PRTMP_ADAPTER pAd, | 5853 | IN PRTMP_ADAPTER pAd, |
5857 | IN PUCHAR pFrame, | 5854 | IN PUCHAR pFrame, |
@@ -5864,7 +5861,6 @@ VOID WpaSendMicFailureToWpaSupplicant( | |||
5864 | 5861 | ||
5865 | VOID SendAssocIEsToWpaSupplicant( | 5862 | VOID SendAssocIEsToWpaSupplicant( |
5866 | IN PRTMP_ADAPTER pAd); | 5863 | IN PRTMP_ADAPTER pAd); |
5867 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
5868 | 5864 | ||
5869 | int wext_notify_event_assoc( | 5865 | int wext_notify_event_assoc( |
5870 | IN RTMP_ADAPTER *pAd); | 5866 | IN RTMP_ADAPTER *pAd); |
diff --git a/drivers/staging/rt2870/sta/connect.c b/drivers/staging/rt2870/sta/connect.c index d0784be65e4..b06c5c137de 100644 --- a/drivers/staging/rt2870/sta/connect.c +++ b/drivers/staging/rt2870/sta/connect.c | |||
@@ -260,9 +260,8 @@ VOID CntlIdleProc( | |||
260 | DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid, REASON_DISASSOC_STA_LEAVING); | 260 | DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid, REASON_DISASSOC_STA_LEAVING); |
261 | MlmeEnqueue(pAd, ASSOC_STATE_MACHINE, MT2_MLME_DISASSOC_REQ, sizeof(MLME_DISASSOC_REQ_STRUCT), &DisassocReq); | 261 | MlmeEnqueue(pAd, ASSOC_STATE_MACHINE, MT2_MLME_DISASSOC_REQ, sizeof(MLME_DISASSOC_REQ_STRUCT), &DisassocReq); |
262 | pAd->Mlme.CntlMachine.CurrState = CNTL_WAIT_OID_DISASSOC; | 262 | pAd->Mlme.CntlMachine.CurrState = CNTL_WAIT_OID_DISASSOC; |
263 | #ifdef WPA_SUPPLICANT_SUPPORT | 263 | |
264 | if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_ENABLE_WITH_WEB_UI) | 264 | if (pAd->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_ENABLE_WITH_WEB_UI) |
265 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
266 | { | 265 | { |
267 | // Set the AutoReconnectSsid to prevent it reconnect to old SSID | 266 | // Set the AutoReconnectSsid to prevent it reconnect to old SSID |
268 | // Since calling this indicate user don't want to connect to that SSID anymore. | 267 | // Since calling this indicate user don't want to connect to that SSID anymore. |
@@ -1479,15 +1478,11 @@ VOID LinkUp( | |||
1479 | 1478 | ||
1480 | 1479 | ||
1481 | // If WEP is enabled, add paiewise and shared key | 1480 | // If WEP is enabled, add paiewise and shared key |
1482 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1483 | if (((pAd->StaCfg.WpaSupplicantUP)&& | 1481 | if (((pAd->StaCfg.WpaSupplicantUP)&& |
1484 | (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled)&& | 1482 | (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled)&& |
1485 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED)) || | 1483 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED)) || |
1486 | ((pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)&& | 1484 | ((pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)&& |
1487 | (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled))) | 1485 | (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled))) |
1488 | #else | ||
1489 | if (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled) | ||
1490 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1491 | { | 1486 | { |
1492 | PUCHAR Key; | 1487 | PUCHAR Key; |
1493 | UCHAR CipherAlg; | 1488 | UCHAR CipherAlg; |
@@ -1915,7 +1910,7 @@ VOID LinkDown( | |||
1915 | } | 1910 | } |
1916 | 1911 | ||
1917 | // 802.1x port control | 1912 | // 802.1x port control |
1918 | #ifdef WPA_SUPPLICANT_SUPPORT | 1913 | |
1919 | // Prevent clear PortSecured here with static WEP | 1914 | // Prevent clear PortSecured here with static WEP |
1920 | // NetworkManger set security policy first then set SSID to connect AP. | 1915 | // NetworkManger set security policy first then set SSID to connect AP. |
1921 | if (pAd->StaCfg.WpaSupplicantUP && | 1916 | if (pAd->StaCfg.WpaSupplicantUP && |
@@ -1925,7 +1920,6 @@ VOID LinkDown( | |||
1925 | pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; | 1920 | pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; |
1926 | } | 1921 | } |
1927 | else | 1922 | else |
1928 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1929 | { | 1923 | { |
1930 | pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED; | 1924 | pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED; |
1931 | pAd->StaCfg.PrivacyFilter = Ndis802_11PrivFilter8021xWEP; | 1925 | pAd->StaCfg.PrivacyFilter = Ndis802_11PrivFilter8021xWEP; |
diff --git a/drivers/staging/rt2870/sta/rtmp_data.c b/drivers/staging/rt2870/sta/rtmp_data.c index b7c10975f18..45b6c4768b3 100644 --- a/drivers/staging/rt2870/sta/rtmp_data.c +++ b/drivers/staging/rt2870/sta/rtmp_data.c | |||
@@ -49,7 +49,6 @@ VOID STARxEAPOLFrameIndicate( | |||
49 | PRXWI_STRUC pRxWI = pRxBlk->pRxWI; | 49 | PRXWI_STRUC pRxWI = pRxBlk->pRxWI; |
50 | UCHAR *pTmpBuf; | 50 | UCHAR *pTmpBuf; |
51 | 51 | ||
52 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
53 | if (pAd->StaCfg.WpaSupplicantUP) | 52 | if (pAd->StaCfg.WpaSupplicantUP) |
54 | { | 53 | { |
55 | // All EAPoL frames have to pass to upper layer (ex. WPA_SUPPLICANT daemon) | 54 | // All EAPoL frames have to pass to upper layer (ex. WPA_SUPPLICANT daemon) |
@@ -115,7 +114,6 @@ VOID STARxEAPOLFrameIndicate( | |||
115 | } | 114 | } |
116 | } | 115 | } |
117 | else | 116 | else |
118 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
119 | { | 117 | { |
120 | // Special DATA frame that has to pass to MLME | 118 | // Special DATA frame that has to pass to MLME |
121 | // 1. Cisco Aironet frames for CCX2. We need pass it to MLME for special process | 119 | // 1. Cisco Aironet frames for CCX2. We need pass it to MLME for special process |
@@ -235,13 +233,11 @@ BOOLEAN STACheckTkipMICValue( | |||
235 | { | 233 | { |
236 | DBGPRINT_RAW(RT_DEBUG_ERROR,("Rx MIC Value error 2\n")); | 234 | DBGPRINT_RAW(RT_DEBUG_ERROR,("Rx MIC Value error 2\n")); |
237 | 235 | ||
238 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
239 | if (pAd->StaCfg.WpaSupplicantUP) | 236 | if (pAd->StaCfg.WpaSupplicantUP) |
240 | { | 237 | { |
241 | WpaSendMicFailureToWpaSupplicant(pAd, (pWpaKey->Type == PAIRWISEKEY) ? TRUE : FALSE); | 238 | WpaSendMicFailureToWpaSupplicant(pAd, (pWpaKey->Type == PAIRWISEKEY) ? TRUE : FALSE); |
242 | } | 239 | } |
243 | else | 240 | else |
244 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
245 | { | 241 | { |
246 | RTMPReportMicError(pAd, pWpaKey); | 242 | RTMPReportMicError(pAd, pWpaKey); |
247 | } | 243 | } |
@@ -961,9 +957,7 @@ NDIS_STATUS STASendPacket( | |||
961 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) || | 957 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) || |
962 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) || | 958 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) || |
963 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) | 959 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) |
964 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
965 | || (pAd->StaCfg.IEEE8021X == TRUE) | 960 | || (pAd->StaCfg.IEEE8021X == TRUE) |
966 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
967 | ) | 961 | ) |
968 | && ((pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED) || (pAd->StaCfg.MicErrCnt >= 2)) | 962 | && ((pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED) || (pAd->StaCfg.MicErrCnt >= 2)) |
969 | && (RTMP_GET_PACKET_EAPOL(pPacket)== FALSE) | 963 | && (RTMP_GET_PACKET_EAPOL(pPacket)== FALSE) |
@@ -1218,9 +1212,7 @@ VOID RTMPSendNullFrame( | |||
1218 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) || | 1212 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) || |
1219 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) || | 1213 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) || |
1220 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) | 1214 | (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) |
1221 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1222 | || (pAd->StaCfg.IEEE8021X == TRUE) | 1215 | || (pAd->StaCfg.IEEE8021X == TRUE) |
1223 | #endif | ||
1224 | ) && | 1216 | ) && |
1225 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED)) | 1217 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED)) |
1226 | { | 1218 | { |
@@ -1341,13 +1333,11 @@ VOID STAFindCipherAlgorithm( | |||
1341 | CipherAlg = CIPHER_NONE; | 1333 | CipherAlg = CIPHER_NONE; |
1342 | else if ((Cipher == Ndis802_11EncryptionDisabled) || (pAd->SharedKey[BSS0][KeyIdx].KeyLen == 0)) | 1334 | else if ((Cipher == Ndis802_11EncryptionDisabled) || (pAd->SharedKey[BSS0][KeyIdx].KeyLen == 0)) |
1343 | CipherAlg = CIPHER_NONE; | 1335 | CipherAlg = CIPHER_NONE; |
1344 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1345 | else if ( pAd->StaCfg.WpaSupplicantUP && | 1336 | else if ( pAd->StaCfg.WpaSupplicantUP && |
1346 | (Cipher == Ndis802_11Encryption1Enabled) && | 1337 | (Cipher == Ndis802_11Encryption1Enabled) && |
1347 | (pAd->StaCfg.IEEE8021X == TRUE) && | 1338 | (pAd->StaCfg.IEEE8021X == TRUE) && |
1348 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED)) | 1339 | (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED)) |
1349 | CipherAlg = CIPHER_NONE; | 1340 | CipherAlg = CIPHER_NONE; |
1350 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1351 | else | 1341 | else |
1352 | { | 1342 | { |
1353 | //Header_802_11.FC.Wep = 1; | 1343 | //Header_802_11.FC.Wep = 1; |
diff --git a/drivers/staging/rt2870/sta/wpa.c b/drivers/staging/rt2870/sta/wpa.c index 8626dcde605..61d8cb94857 100644 --- a/drivers/staging/rt2870/sta/wpa.c +++ b/drivers/staging/rt2870/sta/wpa.c | |||
@@ -1928,8 +1928,6 @@ VOID RTMPReportMicError( | |||
1928 | } | 1928 | } |
1929 | } | 1929 | } |
1930 | 1930 | ||
1931 | |||
1932 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1933 | #define LENGTH_EAP_H 4 | 1931 | #define LENGTH_EAP_H 4 |
1934 | // If the received frame is EAP-Packet ,find out its EAP-Code (Request(0x01), Response(0x02), Success(0x03), Failure(0x04)). | 1932 | // If the received frame is EAP-Packet ,find out its EAP-Code (Request(0x01), Response(0x02), Success(0x03), Failure(0x04)). |
1935 | INT WpaCheckEapCode( | 1933 | INT WpaCheckEapCode( |
@@ -1970,7 +1968,6 @@ VOID WpaSendMicFailureToWpaSupplicant( | |||
1970 | 1968 | ||
1971 | return; | 1969 | return; |
1972 | } | 1970 | } |
1973 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1974 | 1971 | ||
1975 | VOID WpaMicFailureReportFrame( | 1972 | VOID WpaMicFailureReportFrame( |
1976 | IN PRTMP_ADAPTER pAd, | 1973 | IN PRTMP_ADAPTER pAd, |
diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c index 4d8aae9b62b..d02488a6a29 100644 --- a/drivers/staging/rt2870/sta_ioctl.c +++ b/drivers/staging/rt2870/sta_ioctl.c | |||
@@ -163,11 +163,9 @@ INT Set_PSMode_Proc( | |||
163 | IN PRTMP_ADAPTER pAdapter, | 163 | IN PRTMP_ADAPTER pAdapter, |
164 | IN PUCHAR arg); | 164 | IN PUCHAR arg); |
165 | 165 | ||
166 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
167 | INT Set_Wpa_Support( | 166 | INT Set_Wpa_Support( |
168 | IN PRTMP_ADAPTER pAd, | 167 | IN PRTMP_ADAPTER pAd, |
169 | IN PUCHAR arg); | 168 | IN PUCHAR arg); |
170 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
171 | 169 | ||
172 | #ifdef DBG | 170 | #ifdef DBG |
173 | VOID RTMPIoctlBBP( | 171 | VOID RTMPIoctlBBP( |
@@ -264,13 +262,7 @@ static struct { | |||
264 | #ifdef DBG | 262 | #ifdef DBG |
265 | {"Debug", Set_Debug_Proc}, | 263 | {"Debug", Set_Debug_Proc}, |
266 | #endif | 264 | #endif |
267 | |||
268 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
269 | {"WpaSupport", Set_Wpa_Support}, | 265 | {"WpaSupport", Set_Wpa_Support}, |
270 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
271 | |||
272 | |||
273 | |||
274 | {"FixedTxMode", Set_FixedTxMode_Proc}, | 266 | {"FixedTxMode", Set_FixedTxMode_Proc}, |
275 | #ifdef DOT11_N_SUPPORT | 267 | #ifdef DOT11_N_SUPPORT |
276 | {"TGnWifiTest", Set_TGnWifiTest_Proc}, | 268 | {"TGnWifiTest", Set_TGnWifiTest_Proc}, |
@@ -305,14 +297,13 @@ VOID RTMPAddKey( | |||
305 | NdisZeroMemory(&pAd->SharedKey[BSS0][0], sizeof(CIPHER_KEY)); | 297 | NdisZeroMemory(&pAd->SharedKey[BSS0][0], sizeof(CIPHER_KEY)); |
306 | pAd->SharedKey[BSS0][0].KeyLen = LEN_TKIP_EK; | 298 | pAd->SharedKey[BSS0][0].KeyLen = LEN_TKIP_EK; |
307 | NdisMoveMemory(pAd->SharedKey[BSS0][0].Key, pKey->KeyMaterial, LEN_TKIP_EK); | 299 | NdisMoveMemory(pAd->SharedKey[BSS0][0].Key, pKey->KeyMaterial, LEN_TKIP_EK); |
308 | #ifdef WPA_SUPPLICANT_SUPPORT | 300 | |
309 | if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled) | 301 | if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled) |
310 | { | 302 | { |
311 | NdisMoveMemory(pAd->SharedKey[BSS0][0].RxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); | 303 | NdisMoveMemory(pAd->SharedKey[BSS0][0].RxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); |
312 | NdisMoveMemory(pAd->SharedKey[BSS0][0].TxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); | 304 | NdisMoveMemory(pAd->SharedKey[BSS0][0].TxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); |
313 | } | 305 | } |
314 | else | 306 | else |
315 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
316 | { | 307 | { |
317 | NdisMoveMemory(pAd->SharedKey[BSS0][0].TxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); | 308 | NdisMoveMemory(pAd->SharedKey[BSS0][0].TxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); |
318 | NdisMoveMemory(pAd->SharedKey[BSS0][0].RxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); | 309 | NdisMoveMemory(pAd->SharedKey[BSS0][0].RxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); |
@@ -366,14 +357,13 @@ VOID RTMPAddKey( | |||
366 | NdisZeroMemory(&pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId], sizeof(CIPHER_KEY)); | 357 | NdisZeroMemory(&pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId], sizeof(CIPHER_KEY)); |
367 | pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].KeyLen = LEN_TKIP_EK; | 358 | pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].KeyLen = LEN_TKIP_EK; |
368 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].Key, pKey->KeyMaterial, LEN_TKIP_EK); | 359 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].Key, pKey->KeyMaterial, LEN_TKIP_EK); |
369 | #ifdef WPA_SUPPLICANT_SUPPORT | 360 | |
370 | if (pAd->StaCfg.GroupCipher == Ndis802_11Encryption2Enabled) | 361 | if (pAd->StaCfg.GroupCipher == Ndis802_11Encryption2Enabled) |
371 | { | 362 | { |
372 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].RxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); | 363 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].RxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); |
373 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].TxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); | 364 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].TxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); |
374 | } | 365 | } |
375 | else | 366 | else |
376 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
377 | { | 367 | { |
378 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].TxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); | 368 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].TxMic, pKey->KeyMaterial + LEN_TKIP_EK, LEN_TKIP_TXMICK); |
379 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].RxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); | 369 | NdisMoveMemory(pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].RxMic, pKey->KeyMaterial + LEN_TKIP_EK + LEN_TKIP_TXMICK, LEN_TKIP_RXMICK); |
@@ -854,14 +844,12 @@ int rt_ioctl_giwap(struct net_device *dev, | |||
854 | ap_addr->sa_family = ARPHRD_ETHER; | 844 | ap_addr->sa_family = ARPHRD_ETHER; |
855 | memcpy(ap_addr->sa_data, &pAdapter->CommonCfg.Bssid, ETH_ALEN); | 845 | memcpy(ap_addr->sa_data, &pAdapter->CommonCfg.Bssid, ETH_ALEN); |
856 | } | 846 | } |
857 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
858 | // Add for RT2870 | 847 | // Add for RT2870 |
859 | else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) | 848 | else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) |
860 | { | 849 | { |
861 | ap_addr->sa_family = ARPHRD_ETHER; | 850 | ap_addr->sa_family = ARPHRD_ETHER; |
862 | memcpy(ap_addr->sa_data, &pAdapter->MlmeAux.Bssid, ETH_ALEN); | 851 | memcpy(ap_addr->sa_data, &pAdapter->MlmeAux.Bssid, ETH_ALEN); |
863 | } | 852 | } |
864 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
865 | else | 853 | else |
866 | { | 854 | { |
867 | DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCGIWAP(=EMPTY)\n")); | 855 | DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCGIWAP(=EMPTY)\n")); |
@@ -970,12 +958,10 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
970 | } | 958 | } |
971 | 959 | ||
972 | 960 | ||
973 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
974 | if (pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) | 961 | if (pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) |
975 | { | 962 | { |
976 | pAdapter->StaCfg.WpaSupplicantScanCount++; | 963 | pAdapter->StaCfg.WpaSupplicantScanCount++; |
977 | } | 964 | } |
978 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
979 | 965 | ||
980 | pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE; | 966 | pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE; |
981 | if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS)) | 967 | if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS)) |
@@ -983,7 +969,6 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
983 | do{ | 969 | do{ |
984 | Now = jiffies; | 970 | Now = jiffies; |
985 | 971 | ||
986 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
987 | if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) && | 972 | if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) && |
988 | (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) | 973 | (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) |
989 | { | 974 | { |
@@ -991,7 +976,6 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
991 | Status = NDIS_STATUS_SUCCESS; | 976 | Status = NDIS_STATUS_SUCCESS; |
992 | break; | 977 | break; |
993 | } | 978 | } |
994 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
995 | 979 | ||
996 | if ((OPSTATUS_TEST_FLAG(pAdapter, fOP_STATUS_MEDIA_STATE_CONNECTED)) && | 980 | if ((OPSTATUS_TEST_FLAG(pAdapter, fOP_STATUS_MEDIA_STATE_CONNECTED)) && |
997 | ((pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPA) || | 981 | ((pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPA) || |
@@ -1051,13 +1035,10 @@ int rt_ioctl_giwscan(struct net_device *dev, | |||
1051 | return -EAGAIN; | 1035 | return -EAGAIN; |
1052 | } | 1036 | } |
1053 | 1037 | ||
1054 | |||
1055 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1056 | if (pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) | 1038 | if (pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) |
1057 | { | 1039 | { |
1058 | pAdapter->StaCfg.WpaSupplicantScanCount = 0; | 1040 | pAdapter->StaCfg.WpaSupplicantScanCount = 0; |
1059 | } | 1041 | } |
1060 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1061 | 1042 | ||
1062 | if (pAdapter->ScanTab.BssNr == 0) | 1043 | if (pAdapter->ScanTab.BssNr == 0) |
1063 | { | 1044 | { |
@@ -1398,14 +1379,12 @@ int rt_ioctl_giwessid(struct net_device *dev, | |||
1398 | memcpy(essid, pAdapter->CommonCfg.Ssid, pAdapter->CommonCfg.SsidLen); | 1379 | memcpy(essid, pAdapter->CommonCfg.Ssid, pAdapter->CommonCfg.SsidLen); |
1399 | } | 1380 | } |
1400 | #ifdef RT2870 | 1381 | #ifdef RT2870 |
1401 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1402 | // Add for RT2870 | 1382 | // Add for RT2870 |
1403 | else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) | 1383 | else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) |
1404 | { | 1384 | { |
1405 | data->length = pAdapter->CommonCfg.SsidLen; | 1385 | data->length = pAdapter->CommonCfg.SsidLen; |
1406 | memcpy(essid, pAdapter->CommonCfg.Ssid, pAdapter->CommonCfg.SsidLen); | 1386 | memcpy(essid, pAdapter->CommonCfg.Ssid, pAdapter->CommonCfg.SsidLen); |
1407 | } | 1387 | } |
1408 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1409 | #endif // RT2870 // | 1388 | #endif // RT2870 // |
1410 | else | 1389 | else |
1411 | {//the ANY ssid was specified | 1390 | {//the ANY ssid was specified |
@@ -1901,10 +1880,7 @@ rt_private_get_statistics(struct net_device *dev, struct iw_request_info *info, | |||
1901 | sprintf(extra+strlen(extra), "RSSI-B (if available) = %ld\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi1 - pAd->BbpRssiToDbmDelta)); | 1880 | sprintf(extra+strlen(extra), "RSSI-B (if available) = %ld\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi1 - pAd->BbpRssiToDbmDelta)); |
1902 | sprintf(extra+strlen(extra), "RSSI-C (if available) = %ld\n\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi2 - pAd->BbpRssiToDbmDelta)); | 1881 | sprintf(extra+strlen(extra), "RSSI-C (if available) = %ld\n\n", (LONG)(pAd->StaCfg.RssiSample.LastRssi2 - pAd->BbpRssiToDbmDelta)); |
1903 | } | 1882 | } |
1904 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1905 | sprintf(extra+strlen(extra), "WpaSupplicantUP = %d\n\n", pAd->StaCfg.WpaSupplicantUP); | 1883 | sprintf(extra+strlen(extra), "WpaSupplicantUP = %d\n\n", pAd->StaCfg.WpaSupplicantUP); |
1906 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
1907 | |||
1908 | 1884 | ||
1909 | wrq->length = strlen(extra) + 1; // 1: size of '\0' | 1885 | wrq->length = strlen(extra) + 1; // 1: size of '\0' |
1910 | DBGPRINT(RT_DEBUG_TRACE, ("<== rt_private_get_statistics, wrq->length = %d\n", wrq->length)); | 1886 | DBGPRINT(RT_DEBUG_TRACE, ("<== rt_private_get_statistics, wrq->length = %d\n", wrq->length)); |
@@ -2216,9 +2192,7 @@ int rt_ioctl_siwauth(struct net_device *dev, | |||
2216 | pAdapter->StaCfg.WepStatus = Ndis802_11WEPEnabled; | 2192 | pAdapter->StaCfg.WepStatus = Ndis802_11WEPEnabled; |
2217 | pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; | 2193 | pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; |
2218 | pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled; | 2194 | pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled; |
2219 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
2220 | pAdapter->StaCfg.IEEE8021X = FALSE; | 2195 | pAdapter->StaCfg.IEEE8021X = FALSE; |
2221 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
2222 | } | 2196 | } |
2223 | else if (param->value == IW_AUTH_CIPHER_TKIP) | 2197 | else if (param->value == IW_AUTH_CIPHER_TKIP) |
2224 | { | 2198 | { |
@@ -2260,22 +2234,16 @@ int rt_ioctl_siwauth(struct net_device *dev, | |||
2260 | if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) | 2234 | if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK) |
2261 | { | 2235 | { |
2262 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA; | 2236 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA; |
2263 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
2264 | pAdapter->StaCfg.IEEE8021X = FALSE; | 2237 | pAdapter->StaCfg.IEEE8021X = FALSE; |
2265 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
2266 | } | 2238 | } |
2267 | else if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) | 2239 | else if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPA2PSK) |
2268 | { | 2240 | { |
2269 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; | 2241 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; |
2270 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
2271 | pAdapter->StaCfg.IEEE8021X = FALSE; | 2242 | pAdapter->StaCfg.IEEE8021X = FALSE; |
2272 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
2273 | } | 2243 | } |
2274 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
2275 | else | 2244 | else |
2276 | // WEP 1x | 2245 | // WEP 1x |
2277 | pAdapter->StaCfg.IEEE8021X = TRUE; | 2246 | pAdapter->StaCfg.IEEE8021X = TRUE; |
2278 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
2279 | } | 2247 | } |
2280 | else if (param->value == 0) | 2248 | else if (param->value == 0) |
2281 | { | 2249 | { |
@@ -3140,12 +3108,10 @@ INT RTMPSetInformation( | |||
3140 | #ifdef DOT11_N_SUPPORT | 3108 | #ifdef DOT11_N_SUPPORT |
3141 | OID_SET_HT_PHYMODE HT_PhyMode; //11n ,kathy | 3109 | OID_SET_HT_PHYMODE HT_PhyMode; //11n ,kathy |
3142 | #endif // DOT11_N_SUPPORT // | 3110 | #endif // DOT11_N_SUPPORT // |
3143 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
3144 | PNDIS_802_11_PMKID pPmkId = NULL; | 3111 | PNDIS_802_11_PMKID pPmkId = NULL; |
3145 | BOOLEAN IEEE8021xState = FALSE; | 3112 | BOOLEAN IEEE8021xState = FALSE; |
3146 | BOOLEAN IEEE8021x_required_keys = FALSE; | 3113 | BOOLEAN IEEE8021x_required_keys = FALSE; |
3147 | UCHAR wpa_supplicant_enable = 0; | 3114 | UCHAR wpa_supplicant_enable = 0; |
3148 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
3149 | 3115 | ||
3150 | #ifdef DOT11_N_SUPPORT | 3116 | #ifdef DOT11_N_SUPPORT |
3151 | MaxPhyMode = PHY_11N_5G; | 3117 | MaxPhyMode = PHY_11N_5G; |
@@ -4090,18 +4056,15 @@ INT RTMPSetInformation( | |||
4090 | // Default key for tx (shared key) | 4056 | // Default key for tx (shared key) |
4091 | if (pWepKey->KeyIndex & 0x80000000) | 4057 | if (pWepKey->KeyIndex & 0x80000000) |
4092 | { | 4058 | { |
4093 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
4094 | // set key material and key length | 4059 | // set key material and key length |
4095 | NdisZeroMemory(pAdapter->StaCfg.DesireSharedKey[KeyIdx].Key, 16); | 4060 | NdisZeroMemory(pAdapter->StaCfg.DesireSharedKey[KeyIdx].Key, 16); |
4096 | pAdapter->StaCfg.DesireSharedKey[KeyIdx].KeyLen = (UCHAR) pWepKey->KeyLength; | 4061 | pAdapter->StaCfg.DesireSharedKey[KeyIdx].KeyLen = (UCHAR) pWepKey->KeyLength; |
4097 | NdisMoveMemory(pAdapter->StaCfg.DesireSharedKey[KeyIdx].Key, &pWepKey->KeyMaterial, pWepKey->KeyLength); | 4062 | NdisMoveMemory(pAdapter->StaCfg.DesireSharedKey[KeyIdx].Key, &pWepKey->KeyMaterial, pWepKey->KeyLength); |
4098 | pAdapter->StaCfg.DesireSharedKeyId = KeyIdx; | 4063 | pAdapter->StaCfg.DesireSharedKeyId = KeyIdx; |
4099 | pAdapter->StaCfg.DesireSharedKey[KeyIdx].CipherAlg = CipherAlg; | 4064 | pAdapter->StaCfg.DesireSharedKey[KeyIdx].CipherAlg = CipherAlg; |
4100 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
4101 | pAdapter->StaCfg.DefaultKeyId = (UCHAR) KeyIdx; | 4065 | pAdapter->StaCfg.DefaultKeyId = (UCHAR) KeyIdx; |
4102 | } | 4066 | } |
4103 | 4067 | ||
4104 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
4105 | if ((pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) && | 4068 | if ((pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) && |
4106 | (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA)) | 4069 | (pAdapter->StaCfg.AuthMode >= Ndis802_11AuthModeWPA)) |
4107 | { | 4070 | { |
@@ -4119,7 +4082,6 @@ INT RTMPSetInformation( | |||
4119 | pAdapter->IndicateMediaState = NdisMediaStateConnected; | 4082 | pAdapter->IndicateMediaState = NdisMediaStateConnected; |
4120 | } | 4083 | } |
4121 | else if (pAdapter->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED) | 4084 | else if (pAdapter->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED) |
4122 | #endif // WPA_SUPPLICANT_SUPPORT | ||
4123 | { | 4085 | { |
4124 | Key = pAdapter->SharedKey[BSS0][KeyIdx].Key; | 4086 | Key = pAdapter->SharedKey[BSS0][KeyIdx].Key; |
4125 | 4087 | ||
@@ -4140,7 +4102,6 @@ INT RTMPSetInformation( | |||
4140 | } | 4102 | } |
4141 | kfree(pWepKey); | 4103 | kfree(pWepKey); |
4142 | break; | 4104 | break; |
4143 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
4144 | case OID_SET_COUNTERMEASURES: | 4105 | case OID_SET_COUNTERMEASURES: |
4145 | if (wrq->u.data.length != sizeof(int)) | 4106 | if (wrq->u.data.length != sizeof(int)) |
4146 | Status = -EINVAL; | 4107 | Status = -EINVAL; |
@@ -4274,8 +4235,6 @@ INT RTMPSetInformation( | |||
4274 | if(pPmkId) | 4235 | if(pPmkId) |
4275 | kfree(pPmkId); | 4236 | kfree(pPmkId); |
4276 | break; | 4237 | break; |
4277 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
4278 | |||
4279 | default: | 4238 | default: |
4280 | DBGPRINT(RT_DEBUG_TRACE, ("Set::unknown IOCTL's subcmd = 0x%08x\n", cmd)); | 4239 | DBGPRINT(RT_DEBUG_TRACE, ("Set::unknown IOCTL's subcmd = 0x%08x\n", cmd)); |
4281 | Status = -EOPNOTSUPP; | 4240 | Status = -EOPNOTSUPP; |
@@ -4811,7 +4770,6 @@ INT RTMPQueryInformation( | |||
4811 | Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CommonCfg.bWmmCapable, wrq->u.data.length); | 4770 | Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CommonCfg.bWmmCapable, wrq->u.data.length); |
4812 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_QUERY_WMM (=%d)\n", pAdapter->CommonCfg.bWmmCapable)); | 4771 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_QUERY_WMM (=%d)\n", pAdapter->CommonCfg.bWmmCapable)); |
4813 | break; | 4772 | break; |
4814 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
4815 | case RT_OID_NEW_DRIVER: | 4773 | case RT_OID_NEW_DRIVER: |
4816 | { | 4774 | { |
4817 | UCHAR enabled = 1; | 4775 | UCHAR enabled = 1; |
@@ -4825,8 +4783,6 @@ INT RTMPQueryInformation( | |||
4825 | Status = copy_to_user(wrq->u.data.pointer, &pAdapter->StaCfg.WpaSupplicantUP, wrq->u.data.length); | 4783 | Status = copy_to_user(wrq->u.data.pointer, &pAdapter->StaCfg.WpaSupplicantUP, wrq->u.data.length); |
4826 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_WPA_SUPPLICANT_SUPPORT (=%d)\n", pAdapter->StaCfg.WpaSupplicantUP)); | 4784 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_WPA_SUPPLICANT_SUPPORT (=%d)\n", pAdapter->StaCfg.WpaSupplicantUP)); |
4827 | break; | 4785 | break; |
4828 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
4829 | |||
4830 | case RT_OID_DRIVER_DEVICE_NAME: | 4786 | case RT_OID_DRIVER_DEVICE_NAME: |
4831 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_DRIVER_DEVICE_NAME \n")); | 4787 | DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_DRIVER_DEVICE_NAME \n")); |
4832 | wrq->u.data.length = 16; | 4788 | wrq->u.data.length = 16; |
@@ -5510,12 +5466,10 @@ INT Set_AuthMode_Proc( | |||
5510 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPANone; | 5466 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPANone; |
5511 | else if ((strcmp(arg, "WPA2PSK") == 0) || (strcmp(arg, "wpa2psk") == 0)) | 5467 | else if ((strcmp(arg, "WPA2PSK") == 0) || (strcmp(arg, "wpa2psk") == 0)) |
5512 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; | 5468 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; |
5513 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
5514 | else if ((strcmp(arg, "WPA") == 0) || (strcmp(arg, "wpa") == 0)) | 5469 | else if ((strcmp(arg, "WPA") == 0) || (strcmp(arg, "wpa") == 0)) |
5515 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA; | 5470 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA; |
5516 | else if ((strcmp(arg, "WPA2") == 0) || (strcmp(arg, "wpa2") == 0)) | 5471 | else if ((strcmp(arg, "WPA2") == 0) || (strcmp(arg, "wpa2") == 0)) |
5517 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; | 5472 | pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2; |
5518 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
5519 | else | 5473 | else |
5520 | return FALSE; | 5474 | return FALSE; |
5521 | 5475 | ||
@@ -6057,7 +6011,6 @@ INT Set_PSMode_Proc( | |||
6057 | return TRUE; | 6011 | return TRUE; |
6058 | } | 6012 | } |
6059 | 6013 | ||
6060 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
6061 | /* | 6014 | /* |
6062 | ========================================================================== | 6015 | ========================================================================== |
6063 | Description: | 6016 | Description: |
@@ -6088,7 +6041,6 @@ INT Set_Wpa_Support( | |||
6088 | 6041 | ||
6089 | return TRUE; | 6042 | return TRUE; |
6090 | } | 6043 | } |
6091 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
6092 | 6044 | ||
6093 | #ifdef DBG | 6045 | #ifdef DBG |
6094 | /* | 6046 | /* |