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

staging:rtl8192u: Rename TsCommonInfo - Style 



Rename the member variable TsCommonInfo in two structures, both
tx_ts_record and RX_TS_RECORD. This member variable is used in both
structures and in both cases causes a checkpatch issue with CamelCase
naming.

The changes are purely coding style 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 1538be28

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+4 −4
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ TsInitAddBA( 
	pBA->DialogToken++;						// DialogToken: Only keep the latest dialog token

	pBA->BaParamSet.field.AMSDU_Support = 0;	// Do not support A-MSDU with A-MPDU now!!

	pBA->BaParamSet.field.BAPolicy = Policy;	// Policy: Delayed or Immediate

	pBA->BaParamSet.field.TID = pTS->TsCommonInfo.t_spec.f.TSInfo.field.ucTSID;	// TID

	pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.f.TSInfo.field.ucTSID;	// TID

	// BufferSize: This need to be set according to A-MPDU vector

	pBA->BaParamSet.field.BufferSize = 32;		// BufferSize: This need to be set according to A-MPDU vector

	pBA->BaTimeoutValue = 0;					// Timeout value: Set 0 to disable Timer
@@ -634,7 +634,7 @@ TsInitAddBA( 


	ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);



	ieee80211_send_ADDBAReq(ieee, pTS->TsCommonInfo.addr, pBA);

	ieee80211_send_ADDBAReq(ieee, pTS->ts_common_info.addr, pBA);

}



void
@@ -683,7 +683,7 @@ void TxBaInactTimeout(struct timer_list *t) 
	TxTsDeleteBA(ieee, pTxTs);

	ieee80211_send_DELBA(

		ieee,

		pTxTs->TsCommonInfo.addr,

		pTxTs->ts_common_info.addr,

		&pTxTs->TxAdmittedBARecord,

		TX_DIR,

		DELBA_REASON_TIMEOUT);
@@ -697,7 +697,7 @@ void RxBaInactTimeout(struct timer_list *t) 
	RxTsDeleteBA(ieee, pRxTs);

	ieee80211_send_DELBA(

		ieee,

		pRxTs->TsCommonInfo.addr,

		pRxTs->ts_common_info.addr,

		&pRxTs->RxAdmittedBARecord,

		RX_DIR,

		DELBA_REASON_TIMEOUT);

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct ts_common_info { 
};



struct tx_ts_record {

	struct ts_common_info		TsCommonInfo;

	struct ts_common_info		ts_common_info;

	u16				TxCurSeq;

	BA_RECORD			TxPendingBARecord;	/*  For BA Originator */

	BA_RECORD			TxAdmittedBARecord;	/*  For BA Originator */
@@ -40,7 +40,7 @@ struct tx_ts_record { 
};



typedef struct _RX_TS_RECORD {

	struct ts_common_info		TsCommonInfo;

	struct ts_common_info		ts_common_info;

	u16				RxIndicateSeq;

	u16				RxTimeoutIndicateSeq;

	struct list_head		RxPendingPktList;

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+10 −10
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) 


static void ResetTxTsEntry(struct tx_ts_record *pTS)

{

	ResetTsCommonInfo(&pTS->TsCommonInfo);

	ResetTsCommonInfo(&pTS->ts_common_info);

	pTS->TxCurSeq = 0;

	pTS->bAddBaReqInProgress = false;

	pTS->bAddBaReqDelayed = false;
@@ -123,7 +123,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) 


static void ResetRxTsEntry(PRX_TS_RECORD pTS)

{

	ResetTsCommonInfo(&pTS->TsCommonInfo);

	ResetTsCommonInfo(&pTS->ts_common_info);

	pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!!

	pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!!

	ResetBaEntry(&pTS->RxAdmittedBARecord);	  // For BA Recipient
@@ -146,9 +146,9 @@ void TSInitialize(struct ieee80211_device *ieee) 
		pTxTS->num = count;

		// The timers for the operation of Traffic Stream and Block Ack.

		// DLS related timer will be add here in the future!!

		timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,

		timer_setup(&pTxTS->ts_common_info.setup_timer, TsSetupTimeOut,

			    0);

		timer_setup(&pTxTS->TsCommonInfo.inact_timer, TsInactTimeout,

		timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,

			    0);

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

		timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
@@ -156,7 +156,7 @@ void TSInitialize(struct ieee80211_device *ieee) 
		timer_setup(&pTxTS->TxAdmittedBARecord.Timer,

			    TxBaInactTimeout, 0);

		ResetTxTsEntry(pTxTS);

		list_add_tail(&pTxTS->TsCommonInfo.list, &ieee->Tx_TS_Unused_List);

		list_add_tail(&pTxTS->ts_common_info.list, &ieee->Tx_TS_Unused_List);

		pTxTS++;

	}
@@ -167,15 +167,15 @@ void TSInitialize(struct ieee80211_device *ieee) 
	for(count = 0; count < TOTAL_TS_NUM; count++) {

		pRxTS->num = count;

		INIT_LIST_HEAD(&pRxTS->RxPendingPktList);

		timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,

		timer_setup(&pRxTS->ts_common_info.setup_timer, TsSetupTimeOut,

			    0);

		timer_setup(&pRxTS->TsCommonInfo.inact_timer, TsInactTimeout,

		timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout,

			    0);

		timer_setup(&pRxTS->RxAdmittedBARecord.Timer,

			    RxBaInactTimeout, 0);

		timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0);

		ResetRxTsEntry(pRxTS);

		list_add_tail(&pRxTS->TsCommonInfo.list, &ieee->Rx_TS_Unused_List);

		list_add_tail(&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List);

		pRxTS++;

	}

	// Initialize unused Rx Reorder List.
@@ -374,10 +374,10 @@ bool GetTs( 
				(*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);

				list_del_init(&(*ppTS)->list);

				if(TxRxSelect==TX_DIR) {

					struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, TsCommonInfo);

					struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, ts_common_info);

					ResetTxTsEntry(tmp);

				} else {

					PRX_TS_RECORD tmp = container_of(*ppTS, RX_TS_RECORD, TsCommonInfo);

					PRX_TS_RECORD tmp = container_of(*ppTS, RX_TS_RECORD, ts_common_info);

					ResetRxTsEntry(tmp);

				}