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

staging:rtl8192u: Rename bAddBaReqDelayed - Style 



Rename the member variable bAddBaReqDelayed to add_ba_req_delayed
This change clears the checkpatch issue with CamelCase naming.

The resulting changes are purely coding style changes which should
have no impact on runtime code execution.

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

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -500,7 +500,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
		//

		//

		if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {

		if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {

			// Since this is a kind of ADDBA failed, we delay next ADDBA process.

			// Since this is a kind of ADDBA failed, we delay next ADDBA process.

			pTS->bAddBaReqDelayed = true;

			pTS->add_ba_req_delayed = true;

			DeActivateBAEntry(ieee, pAdmittedBA);

			DeActivateBAEntry(ieee, pAdmittedBA);

			ReasonCode = DELBA_REASON_END_BA;

			ReasonCode = DELBA_REASON_END_BA;

			goto OnADDBARsp_Reject;

			goto OnADDBARsp_Reject;
@@ -518,7 +518,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
		ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);

		ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);

	} else {

	} else {

		// Delay next ADDBA process.

		// Delay next ADDBA process.

		pTS->bAddBaReqDelayed = true;

		pTS->add_ba_req_delayed = true;

	}

	}





	// End of procedure

	// End of procedure
@@ -596,7 +596,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) 




		pTxTs->bUsingBa = false;

		pTxTs->bUsingBa = false;

		pTxTs->add_ba_req_in_progress = false;

		pTxTs->add_ba_req_in_progress = false;

		pTxTs->bAddBaReqDelayed = false;

		pTxTs->add_ba_req_delayed = false;

		del_timer_sync(&pTxTs->TsAddBaTimer);

		del_timer_sync(&pTxTs->TsAddBaTimer);

		//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer);

		//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer);

		TxTsDeleteBA(ieee, pTxTs);

		TxTsDeleteBA(ieee, pTxTs);
@@ -672,7 +672,7 @@ void BaSetupTimeOut(struct timer_list *t) 
	struct tx_ts_record *pTxTs = from_timer(pTxTs, t, tx_pending_ba_record.Timer);

	struct tx_ts_record *pTxTs = from_timer(pTxTs, t, tx_pending_ba_record.Timer);





	pTxTs->add_ba_req_in_progress = false;

	pTxTs->add_ba_req_in_progress = false;

	pTxTs->bAddBaReqDelayed = true;

	pTxTs->add_ba_req_delayed = true;

	pTxTs->tx_pending_ba_record.bValid = false;

	pTxTs->tx_pending_ba_record.bValid = false;

}

}

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ struct tx_ts_record { 
	BA_RECORD			tx_admitted_ba_record;	/*  For BA Originator */

	BA_RECORD			tx_admitted_ba_record;	/*  For BA Originator */

/* 	QOS_DL_RECORD		DLRecord; */

/* 	QOS_DL_RECORD		DLRecord; */

	u8				add_ba_req_in_progress;

	u8				add_ba_req_in_progress;

	u8				bAddBaReqDelayed;

	u8				add_ba_req_delayed;

	u8				bUsingBa;

	u8				bUsingBa;

	struct timer_list		TsAddBaTimer;

	struct timer_list		TsAddBaTimer;

	u8				num;

	u8				num;

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -115,7 +115,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) 
	ResetTsCommonInfo(&pTS->ts_common_info);

	ResetTsCommonInfo(&pTS->ts_common_info);

	pTS->tx_cur_seq = 0;

	pTS->tx_cur_seq = 0;

	pTS->add_ba_req_in_progress = false;

	pTS->add_ba_req_in_progress = false;

	pTS->bAddBaReqDelayed = false;

	pTS->add_ba_req_delayed = false;

	pTS->bUsingBa = false;

	pTS->bUsingBa = false;

	ResetBaEntry(&pTS->tx_admitted_ba_record); //For BA Originator

	ResetBaEntry(&pTS->tx_admitted_ba_record); //For BA Originator

	ResetBaEntry(&pTS->tx_pending_ba_record);

	ResetBaEntry(&pTS->tx_pending_ba_record);
@@ -524,7 +524,7 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx 
{

{

	if(!pTxTS->add_ba_req_in_progress) {

	if(!pTxTS->add_ba_req_in_progress) {

		pTxTS->add_ba_req_in_progress = true;

		pTxTS->add_ba_req_in_progress = true;

		if(pTxTS->bAddBaReqDelayed)	{

		if(pTxTS->add_ba_req_delayed)	{

			IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");

			IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");

			mod_timer(&pTxTS->TsAddBaTimer,

			mod_timer(&pTxTS->TsAddBaTimer,

				  jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));

				  jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));