diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-08-23 15:32:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:23 -0700 |
| commit | 606661ea0476fb506ca87cd41b58cbb7dc14fcc0 (patch) | |
| tree | dcf094669924ed995bfa6d0f78d6643364538d22 /drivers/staging/rt2860/sta | |
| parent | 5cc86f28ca09738652000e73827a5579279ef810 (diff) | |
Staging: rt2870: add Antenna Diversity support
rt3070:
* remove non-working AntDiversity config parameter
* remove unused bRxAntDiversity field from COMMON_CONFIG
rt2870:
* propagate Antenna Diversity support from rt3070
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/sta')
| -rw-r--r-- | drivers/staging/rt2860/sta/rtmp_data.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c index 91a98afcee1..f751ab61c43 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c @@ -575,10 +575,7 @@ VOID STAHandleRxMgmtFrame( { // We should collect RSSI not only U2M data but also my beacon - if ( -#ifdef RT30xx - pAd->RxAnt.EvaluatePeriod == 0 && -#endif + if (pAd->RxAnt.EvaluatePeriod == 0 && pHeader->FC.SubType == SUBTYPE_BEACON && MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2)) { Update_Rssi_Sample(pAd, &pAd->StaCfg.RssiSample, pRxWI); @@ -587,7 +584,7 @@ VOID STAHandleRxMgmtFrame( pAd->StaCfg.LastSNR1 = (UCHAR)(pRxWI->SNR1); } -#ifdef RT30xx +#ifdef RT2870 // collect rssi information for antenna diversity if (pAd->NicConfig2.field.AntDiversity) { @@ -597,7 +594,7 @@ VOID STAHandleRxMgmtFrame( pAd->StaCfg.NumOfAvgRssiSample ++; } } -#endif // RT30xx // +#endif // First check the size, it MUST not exceed the mlme queue size if (pRxWI->MPDUtotalByteCount > MGMT_DMA_BUFFER_SIZE) |