diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-26 10:05:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:47 -0400 |
commit | 2684d16649c295b4498be5459ebb1e25220e3ee9 (patch) | |
tree | b68d0bd9c907b70fa2db40bd3a719e5c731ccd6f /drivers/staging/rt2860/sta/connect.c | |
parent | 84717059b36187025c6483566de6873661787c74 (diff) |
Staging: rt2860: remove NATIVE_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/staging/rt2860/sta/connect.c')
-rw-r--r-- | drivers/staging/rt2860/sta/connect.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c index 94074774c97..a31f53ddc77 100644 --- a/drivers/staging/rt2860/sta/connect.c +++ b/drivers/staging/rt2860/sta/connect.c | |||
@@ -390,7 +390,7 @@ VOID CntlOidSsidProc( | |||
390 | } | 390 | } |
391 | 391 | ||
392 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; | 392 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; |
393 | #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT | 393 | |
394 | { | 394 | { |
395 | union iwreq_data wrqu; | 395 | union iwreq_data wrqu; |
396 | 396 | ||
@@ -399,7 +399,6 @@ VOID CntlOidSsidProc( | |||
399 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); | 399 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); |
400 | 400 | ||
401 | } | 401 | } |
402 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // | ||
403 | } | 402 | } |
404 | } | 403 | } |
405 | else if (INFRA_ON(pAd)) | 404 | else if (INFRA_ON(pAd)) |
@@ -522,7 +521,7 @@ VOID CntlOidRTBssidProc( | |||
522 | // already connected to the same BSSID, go back to idle state directly | 521 | // already connected to the same BSSID, go back to idle state directly |
523 | DBGPRINT(RT_DEBUG_TRACE, ("CNTL - already in this BSSID. ignore this SET_BSSID request\n")); | 522 | DBGPRINT(RT_DEBUG_TRACE, ("CNTL - already in this BSSID. ignore this SET_BSSID request\n")); |
524 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; | 523 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; |
525 | #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT | 524 | |
526 | { | 525 | { |
527 | union iwreq_data wrqu; | 526 | union iwreq_data wrqu; |
528 | 527 | ||
@@ -531,7 +530,6 @@ VOID CntlOidRTBssidProc( | |||
531 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); | 530 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); |
532 | 531 | ||
533 | } | 532 | } |
534 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // | ||
535 | } | 533 | } |
536 | else | 534 | else |
537 | { | 535 | { |
@@ -1994,25 +1992,11 @@ VOID LinkDown( | |||
1994 | // Allow go to sleep after linkdown steps. | 1992 | // Allow go to sleep after linkdown steps. |
1995 | RTMP_SET_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP); | 1993 | RTMP_SET_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP); |
1996 | 1994 | ||
1997 | #ifdef WPA_SUPPLICANT_SUPPORT | ||
1998 | #ifndef NATIVE_WPA_SUPPLICANT_SUPPORT | ||
1999 | if (pAd->StaCfg.WpaSupplicantUP) { | ||
2000 | union iwreq_data wrqu; | ||
2001 | //send disassociate event to wpa_supplicant | ||
2002 | memset(&wrqu, 0, sizeof(wrqu)); | ||
2003 | wrqu.data.flags = RT_DISASSOC_EVENT_FLAG; | ||
2004 | wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL); | ||
2005 | } | ||
2006 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // | ||
2007 | #endif // WPA_SUPPLICANT_SUPPORT // | ||
2008 | |||
2009 | #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT | ||
2010 | { | 1995 | { |
2011 | union iwreq_data wrqu; | 1996 | union iwreq_data wrqu; |
2012 | memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN); | 1997 | memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN); |
2013 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); | 1998 | wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL); |
2014 | } | 1999 | } |
2015 | #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // | ||
2016 | } | 2000 | } |
2017 | 2001 | ||
2018 | /* | 2002 | /* |