diff --git a/[refs] b/[refs] index 05c1c294dac0..e9018a4a863e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a93e4e1aa8c4f65f455456bc2bb1bcb306ac0f1 +refs/heads/master: 375d662f9fbbc177485f6f6ce030fc0eb622f3d3 diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c index b4c98f160a64..da026eadafd8 100644 --- a/trunk/drivers/staging/rt2860/common/mlme.c +++ b/trunk/drivers/staging/rt2860/common/mlme.c @@ -5756,7 +5756,6 @@ VOID AsicSwitchChannel( RTMP_RF_REGS *RFRegTable; // Search Tx power value -#ifdef RT30xx // We can't use ChannelList to search channel, since some central channl's txpowr doesn't list // in ChannelList, so use TxPower array instead. // @@ -5769,17 +5768,6 @@ VOID AsicSwitchChannel( break; } } -#else - for (index = 0; index < pAd->ChannelListNum; index++) - { - if (Channel == pAd->ChannelList[index].Channel) - { - TxPwer = pAd->ChannelList[index].Power; - TxPwer2 = pAd->ChannelList[index].Power2; - break; - } - } -#endif if (index == MAX_NUM_OF_CHANNELS) DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Can't find the Channel#%d \n", Channel));