From d9edfb176f57bc80ec0c804988d893062ee2895a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 15:31:22 +0200 Subject: [PATCH] --- yaml --- r: 162463 b: refs/heads/master c: f57c3b7c75a3a88d55df2e56df731da5e8f64f90 h: refs/heads/master i: 162461: b13902429a37cc8c86565f0503390c56e525a609 162459: fc7b196facdcbc1289995901083aa7102faac86c 162455: 9bae6338c1c9ae4f43923f03c2baa3a006b4469a 162447: 043d806550ee7a602393e93945316a8d53928674 162431: 235c2090eee435fbc8e6ba27a803780daf783479 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/sta/connect.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d0f4579006d1..5d4c3ddb0577 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e87be5d6aefdebeb66115480dbdf0c7fa96dd28 +refs/heads/master: f57c3b7c75a3a88d55df2e56df731da5e8f64f90 diff --git a/trunk/drivers/staging/rt2860/sta/connect.c b/trunk/drivers/staging/rt2860/sta/connect.c index a0c64071539b..7bc75ab971f9 100644 --- a/trunk/drivers/staging/rt2860/sta/connect.c +++ b/trunk/drivers/staging/rt2860/sta/connect.c @@ -1171,7 +1171,6 @@ VOID LinkUp( OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON); OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON); -#ifdef RT30xx if ((pAd->CommonCfg.HtCapability.HtCapInfo.ChannelWidth == BW_40) && (pAd->CommonCfg.AddHTInfo.AddHtInfo.ExtChanOffset == EXTCHA_ABOVE)) { @@ -1183,7 +1182,6 @@ VOID LinkUp( { pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel - 2; } -#endif #ifdef RT2870 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) AdhocTurnOnQos(pAd); @@ -1585,9 +1583,7 @@ VOID LinkUp( pAd->MacTab.Size = 1; // infra mode always set MACtab size =1. pAd->MacTab.Content[BSSID_WCID].Sst = SST_ASSOC; pAd->MacTab.Content[BSSID_WCID].AuthState = SST_ASSOC; -#ifdef RT30xx pAd->MacTab.Content[BSSID_WCID].AuthMode = pAd->StaCfg.AuthMode; -#endif pAd->MacTab.Content[BSSID_WCID].WepStatus = pAd->StaCfg.WepStatus; NdisReleaseSpinLock(&pAd->MacTabLock); @@ -1712,9 +1708,7 @@ VOID LinkUp( // // if 1. Legacy AP WMM on, or 2. 11n AP, AMPDU disable. Force turn off burst no matter what bEnableTxBurst is. if ( -#ifdef RT30xx !(pAd->CommonCfg.RxStream == 1 && pAd->CommonCfg.TxStream == 1) && -#endif (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED)) || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE)))) {