Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f57c3b7c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: LinkUp() fixes 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e87be5d

drivers/staging/rt2860/sta/connect.c

+0 −6
Original line number Diff line number Diff line
@@ -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))))

	{