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

staging:rtl8192u: Rename TxPendingBARecord - Style 



Rename the member variable TxPendingBARecord to tx_pending_ba_record.
This change clears the checkpatch issue with CamelCase naming.

The changes are purely coding style changes and should not impact
runtime code execution.

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

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA) 
static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs)

{

	PBA_RECORD		pAdmittedBa = &pTxTs->TxAdmittedBARecord;  //These two BA entries must exist in TS structure

	PBA_RECORD		pPendingBa = &pTxTs->TxPendingBARecord;

	PBA_RECORD		pPendingBa = &pTxTs->tx_pending_ba_record;

	u8			bSendDELBA = false;



	// Delete pending BA
@@ -470,7 +470,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
	}



	pTS->bAddBaReqInProgress = false;

	pPendingBA = &pTS->TxPendingBARecord;

	pPendingBA = &pTS->tx_pending_ba_record;

	pAdmittedBA = &pTS->TxAdmittedBARecord;
@@ -615,7 +615,7 @@ TsInitAddBA( 
	u8		bOverwritePending

	)

{

	PBA_RECORD			pBA = &pTS->TxPendingBARecord;

	PBA_RECORD			pBA = &pTS->tx_pending_ba_record;



	if (pBA->bValid && !bOverwritePending)

		return;
@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, 
			ieee80211_send_DELBA(

				ieee,

				pTsCommonInfo->addr,

				(pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->TxPendingBARecord),

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

				TxRxSelect,

				DELBA_REASON_END_BA);

	} else if (TxRxSelect == RX_DIR) {
@@ -669,11 +669,11 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, 
 ********************************************************************************************************************/

void BaSetupTimeOut(struct timer_list *t)

{

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

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



	pTxTs->bAddBaReqInProgress = false;

	pTxTs->bAddBaReqDelayed = true;

	pTxTs->TxPendingBARecord.bValid = false;

	pTxTs->tx_pending_ba_record.bValid = false;

}



void TxBaInactTimeout(struct timer_list *t)

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct ts_common_info { 
struct tx_ts_record {

	struct ts_common_info		ts_common_info;

	u16				tx_cur_seq;

	BA_RECORD			TxPendingBARecord;	/*  For BA Originator */

	BA_RECORD			tx_pending_ba_record;	/*  For BA Originator */

	BA_RECORD			TxAdmittedBARecord;	/*  For BA Originator */

/* 	QOS_DL_RECORD		DLRecord; */

	u8				bAddBaReqInProgress;

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) 
	pTS->bAddBaReqDelayed = false;

	pTS->bUsingBa = false;

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

	ResetBaEntry(&pTS->TxPendingBARecord);

	ResetBaEntry(&pTS->tx_pending_ba_record);

}



static void ResetRxTsEntry(PRX_TS_RECORD pTS)
@@ -151,7 +151,7 @@ void TSInitialize(struct ieee80211_device *ieee) 
		timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,

			    0);

		timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);

		timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,

		timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,

			    0);

		timer_setup(&pTxTS->TxAdmittedBARecord.Timer,

			    TxBaInactTimeout, 0);