Commit f9bd549a authored by Luis de Bethencourt's avatar Luis de Bethencourt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: remove bool comparisons 



Remove explicit true/false comparisons to bool variables.

Signed-off-by: default avatarLuis de Bethencourt <luis@debethencourt.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 047db991

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
		goto rx_dropped;



	// if QoS enabled, should check the sequence for each of the AC

	if( (ieee->pHTInfo->bCurRxReorderEnable == false) || !ieee->current_network.qos_data.active|| !IsDataFrame(skb->data) || IsLegacyDataFrame(skb->data)){

	if ((!ieee->pHTInfo->bCurRxReorderEnable) || !ieee->current_network.qos_data.active|| !IsDataFrame(skb->data) || IsLegacyDataFrame(skb->data)) {

		if (is_duplicate_packet(ieee, hdr))

		goto rx_dropped;
@@ -1307,7 +1307,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
	}



//added by amy for reorder

	if(ieee->pHTInfo->bCurRxReorderEnable == false ||pTS == NULL){

	if (!ieee->pHTInfo->bCurRxReorderEnable || pTS == NULL){

//added by amy for reorder

		for(i = 0; i<rxb->nr_subframes; i++) {

			struct sk_buff *sub_skb = rxb->subframes[i];

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1964,7 +1964,7 @@ static void ieee80211_check_auth_response(struct ieee80211_device *ieee, 
			}



			if (ieee->current_network.mode == IEEE_N_24G &&

					bHalfSupportNmode == true) {

					bHalfSupportNmode) {

				netdev_dbg(ieee->dev, "enter half N mode\n");

				ieee->bHalfWirelessN24GMode = true;

			} else

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -336,12 +336,12 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, 
			printk("===>can't get TS\n");

			return;

		}

		if (pTxTs->TxAdmittedBARecord.bValid == false)

		if (!pTxTs->TxAdmittedBARecord.bValid)

		{

			TsStartAddBaProcess(ieee, pTxTs);

			goto FORCED_AGG_SETTING;

		}

		else if (pTxTs->bUsingBa == false)

		else if (!pTxTs->bUsingBa)

		{

			if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->TxCurSeq+1)%4096))

				pTxTs->bUsingBa = true;

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+6 −6
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	printk("====================>rx ADDBAREQ from :%pM\n", dst);

//some other capability is not ready now.

	if ((ieee->current_network.qos_data.active == 0) ||

		(ieee->pHTInfo->bCurrentHTSupport == false)) //||

	//	(ieee->pStaQos->bEnableRxImmBA == false)	)

		(!ieee->pHTInfo->bCurrentHTSupport)) //||

	//	(!ieee->pStaQos->bEnableRxImmBA)	)

	{

		rc = ADDBA_STATUS_REFUSED;

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n", ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport);
@@ -462,8 +462,8 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
	// Check the capability

	// Since we can always receive A-MPDU, we just check if it is under HT mode.

	if (ieee->current_network.qos_data.active == 0  ||

	    ieee->pHTInfo->bCurrentHTSupport == false ||

	    ieee->pHTInfo->bCurrentAMPDUEnable == false) {

	    !ieee->pHTInfo->bCurrentHTSupport ||

	    !ieee->pHTInfo->bCurrentAMPDUEnable) {

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentAMPDUEnable);

		ReasonCode = DELBA_REASON_UNKNOWN_BA;

		goto OnADDBARsp_Reject;
@@ -502,7 +502,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
		IEEE80211_DEBUG(IEEE80211_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it! \n");

		return -1;

	}

	else if((pPendingBA->bValid == false) ||(*pDialogToken != pPendingBA->DialogToken))

	else if((!pPendingBA->bValid) ||(*pDialogToken != pPendingBA->DialogToken))

	{

		IEEE80211_DEBUG(IEEE80211_DL_ERR,  "OnADDBARsp(): Recv ADDBA Rsp. BA invalid, DELBA! \n");

		ReasonCode = DELBA_REASON_UNKNOWN_BA;
@@ -582,7 +582,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) 
	}



	if (ieee->current_network.qos_data.active == 0 ||

		ieee->pHTInfo->bCurrentHTSupport == false )

	    !ieee->pHTInfo->bCurrentHTSupport)

	{

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "received DELBA while QOS or HT is not supported(%d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport);

		return -1;

drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c

+7 −7
Original line number Diff line number Diff line
@@ -224,9 +224,9 @@ static bool IsHTHalfNmode40Bandwidth(struct ieee80211_device *ieee) 
	bool			retValue = false;

	PRT_HIGH_THROUGHPUT	 pHTInfo = ieee->pHTInfo;



	if(pHTInfo->bCurrentHTSupport == false )	// wireless is n mode

	if(!pHTInfo->bCurrentHTSupport)		// wireless is n mode

		retValue = false;

	else if(pHTInfo->bRegBW40MHz == false)	// station supports 40 bw

	else if(!pHTInfo->bRegBW40MHz)		// station supports 40 bw

		retValue = false;

	else if(!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))	// station in half n mode

		retValue = false;
@@ -243,7 +243,7 @@ static bool IsHTHalfNmodeSGI(struct ieee80211_device *ieee, bool is40MHz) 
	bool			retValue = false;

	PRT_HIGH_THROUGHPUT	 pHTInfo = ieee->pHTInfo;



	if(pHTInfo->bCurrentHTSupport == false )	// wireless is n mode

	if(!pHTInfo->bCurrentHTSupport)		// wireless is n mode

		retValue = false;

	else if(!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))	// station in half n mode

		retValue = false;
@@ -675,7 +675,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le 
	if ( (ieee->iw_mode == IW_MODE_ADHOC) || (ieee->iw_mode == IW_MODE_MASTER)) //ap mode is not currently supported

	{

		pHTInfoEle->ControlChl			= ieee->current_network.channel;

		pHTInfoEle->ExtChlOffset			= ((pHT->bRegBW40MHz == false)?HT_EXTCHNL_OFFSET_NO_EXT:

		pHTInfoEle->ExtChlOffset			= ((!pHT->bRegBW40MHz)?HT_EXTCHNL_OFFSET_NO_EXT:

											(ieee->current_network.channel<=6)?

												HT_EXTCHNL_OFFSET_UPPER:HT_EXTCHNL_OFFSET_LOWER);

		pHTInfoEle->RecommemdedTxWidth	= pHT->bRegBW40MHz;
@@ -945,7 +945,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) 
	static u8				EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};		// For 11n EWC definition, 2007.07.17, by Emily

	static u8				EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};	// For 11n EWC definition, 2007.07.17, by Emily



	if (pHTInfo->bCurrentHTSupport == false) {

	if (!pHTInfo->bCurrentHTSupport) {

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "<=== HTOnAssocRsp(): HT_DISABLE\n");

		return;

	}
@@ -976,7 +976,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) 
	//

	HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));



//	if(pHTInfo->bCurBW40MHz == true)

//	if (pHTInfo->bCurBW40MHz)

		pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);



	//
@@ -1341,7 +1341,7 @@ void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH Bandwidt 
	PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;

//	u32 flags = 0;



	if(pHTInfo->bRegBW40MHz == false)

	if(!pHTInfo->bRegBW40MHz)

		return;