diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-26 16:06:09 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:48 -0700 |
| commit | 993709edbfece976804ae0d52385fc6315e73064 (patch) | |
| tree | 67e36278fa806c31d64e5af87dd27fe2a7bc5af5 /drivers/staging/rt3070/common/cmm_sync.c | |
| parent | Staging: rt2870: remove dead CONFIG_AP_SUPPORT code (diff) | |
| download | linux-dev-993709edbfece976804ae0d52385fc6315e73064.tar.xz linux-dev-993709edbfece976804ae0d52385fc6315e73064.zip | |
Staging: rt3070: remove dead CONFIG_AP_SUPPORT code
Then remove no longer needed IF_DEV_CONFIG_OPMODE_ON_[AP,STA]() macros.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt3070/common/cmm_sync.c')
| -rw-r--r-- | drivers/staging/rt3070/common/cmm_sync.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/rt3070/common/cmm_sync.c b/drivers/staging/rt3070/common/cmm_sync.c index aac30cffa612..509f77ba0de5 100644 --- a/drivers/staging/rt3070/common/cmm_sync.c +++ b/drivers/staging/rt3070/common/cmm_sync.c @@ -383,11 +383,8 @@ VOID ScanNextChannel( PHEADER_802_11 pHdr80211; UINT ScanTimeIn5gChannel = SHORT_CHANNEL_TIME; - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) - { - if (MONITOR_ON(pAd)) - return; - } + if (MONITOR_ON(pAd)) + return; if (pAd->MlmeAux.Channel == 0) { @@ -411,7 +408,6 @@ VOID ScanNextChannel( DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to channel %d, Total BSS[%02d]\n",pAd->CommonCfg.Channel, pAd->ScanTab.BssNr)); } - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) { // // To prevent data lost. @@ -453,7 +449,6 @@ VOID ScanNextChannel( #endif // RT2870 // else { - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) { // BBP and RF are not accessible in PS mode, we has to wake them up first if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) @@ -467,7 +462,6 @@ VOID ScanNextChannel( AsicSwitchChannel(pAd, pAd->MlmeAux.Channel, TRUE); AsicLockChannel(pAd, pAd->MlmeAux.Channel); - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) { if (pAd->MlmeAux.Channel > 14) { @@ -522,7 +516,6 @@ VOID ScanNextChannel( { DBGPRINT(RT_DEBUG_TRACE, ("SYNC - ScanNextChannel() allocate memory fail\n")); - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) { pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE; Status = MLME_FAIL_NO_RESOURCE; @@ -597,8 +590,7 @@ VOID ScanNextChannel( // For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse - IF_DEV_CONFIG_OPMODE_ON_STA(pAd) - pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; + pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; } } |