Commit 1f9766a0 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Rename bValid - Style 



Rename the member variable bValid to valid, this clears the checkpatch
issue with CamelCase naming.

This is a coding style change which should have no impatch on runtime
code execution.

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6fcb0759

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

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

			return;

		}

		if (!pTxTs->tx_admitted_ba_record.bValid)

		if (!pTxTs->tx_admitted_ba_record.valid)

		{

			TsStartAddBaProcess(ieee, pTxTs);

			goto FORCED_AGG_SETTING;

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ union delba_param_set { 


struct ba_record {

	struct timer_list		timer;

	u8				bValid;

	u8				valid;

	u8				DialogToken;

	union ba_param_set		BaParamSet;

	u16				BaTimeoutValue;

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+11 −11
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 ********************************************************************************************************************/

static void ActivateBAEntry(struct ieee80211_device *ieee, struct ba_record *pBA, u16 Time)

{

	pBA->bValid = true;

	pBA->valid = true;

	if (Time != 0)

		mod_timer(&pBA->timer, jiffies + msecs_to_jiffies(Time));

}
@@ -30,7 +30,7 @@ static void ActivateBAEntry(struct ieee80211_device *ieee, struct ba_record *pBA 
 ********************************************************************************************************************/

static void DeActivateBAEntry(struct ieee80211_device *ieee, struct ba_record *pBA)

{

	pBA->bValid = false;

	pBA->valid = false;

	del_timer_sync(&pBA->timer);

}

/********************************************************************************************************************
@@ -47,13 +47,13 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs 
	u8			bSendDELBA = false;



	// Delete pending BA

	if (pPendingBa->bValid) {

	if (pPendingBa->valid) {

		DeActivateBAEntry(ieee, pPendingBa);

		bSendDELBA = true;

	}



	// Delete admitted BA

	if (pAdmittedBa->bValid) {

	if (pAdmittedBa->valid) {

		DeActivateBAEntry(ieee, pAdmittedBa);

		bSendDELBA = true;

	}
@@ -73,7 +73,7 @@ static u8 RxTsDeleteBA(struct ieee80211_device *ieee, struct rx_ts_record *pRxTs 
	struct ba_record       *pBa = &pRxTs->rx_admitted_ba_record;

	u8			bSendDELBA = false;



	if (pBa->bValid) {

	if (pBa->valid) {

		DeActivateBAEntry(ieee, pBa);

		bSendDELBA = true;

	}
@@ -89,7 +89,7 @@ static u8 RxTsDeleteBA(struct ieee80211_device *ieee, struct rx_ts_record *pRxTs 
 ********************************************************************************************************************/

void ResetBaEntry(struct ba_record *pBA)

{

	pBA->bValid			= false;

	pBA->valid			= false;

	pBA->BaParamSet.short_data	= 0;

	pBA->BaTimeoutValue		= 0;

	pBA->DialogToken		= 0;
@@ -478,11 +478,11 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
	// Check if related BA is waiting for setup.

	// If not, reject by sending DELBA frame.

	//

	if (pAdmittedBA->bValid) {

	if (pAdmittedBA->valid) {

		// Since BA is already setup, we ignore all other ADDBA Response.

		IEEE80211_DEBUG(IEEE80211_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it! \n");

		return -1;

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

	} else if ((!pPendingBA->valid) || (*pDialogToken != pPendingBA->DialogToken)) {

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

		ReasonCode = DELBA_REASON_UNKNOWN_BA;

		goto OnADDBARsp_Reject;
@@ -617,7 +617,7 @@ TsInitAddBA( 
{

	struct ba_record *pBA = &pTS->tx_pending_ba_record;



	if (pBA->bValid && !bOverwritePending)

	if (pBA->valid && !bOverwritePending)

		return;



	// Set parameters to "Pending" variable set
@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, 
			ieee80211_send_DELBA(

				ieee,

				pTsCommonInfo->addr,

				(pTxTs->tx_admitted_ba_record.bValid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record),

				(pTxTs->tx_admitted_ba_record.valid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record),

				TxRxSelect,

				DELBA_REASON_END_BA);

	} else if (TxRxSelect == RX_DIR) {
@@ -673,7 +673,7 @@ void BaSetupTimeOut(struct timer_list *t) 


	pTxTs->add_ba_req_in_progress = false;

	pTxTs->add_ba_req_delayed = true;

	pTxTs->tx_pending_ba_record.bValid = false;

	pTxTs->tx_pending_ba_record.valid = false;

}



void TxBaInactTimeout(struct timer_list *t)

CRA Git | Maintained and supported by SUSTech CRA and CCSE