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

staging:rtl8192u: Rename member variable Timer - Style 



Rename the member variable Timer to all lowercase to clear the
checkpatch issue with CamelCase naming.

This change is purely a coding style change 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 f813f408

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ union delba_param_set { 
};



struct ba_record {

	struct timer_list		Timer;

	struct timer_list		timer;

	u8				bValid;

	u8				DialogToken;

	union ba_param_set		BaParamSet;

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static void ActivateBAEntry(struct ieee80211_device *ieee, struct ba_record *pBA 
{

	pBA->bValid = true;

	if (Time != 0)

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

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

}



/********************************************************************************************************************
@@ -31,7 +31,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;

	del_timer_sync(&pBA->Timer);

	del_timer_sync(&pBA->timer);

}

/********************************************************************************************************************

 *function: deactivete BA entry in Tx Ts, and send DELBA.
@@ -669,7 +669,7 @@ 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, 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_delayed = true;
@@ -678,7 +678,7 @@ void BaSetupTimeOut(struct timer_list *t) 


void TxBaInactTimeout(struct timer_list *t)

{

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

	struct tx_ts_record *pTxTs = from_timer(pTxTs, t, tx_admitted_ba_record.timer);

	struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);

	TxTsDeleteBA(ieee, pTxTs);

	ieee80211_send_DELBA(
@@ -691,7 +691,7 @@ void TxBaInactTimeout(struct timer_list *t) 


void RxBaInactTimeout(struct timer_list *t)

{

	struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_admitted_ba_record.Timer);

	struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_admitted_ba_record.timer);

	struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);



	RxTsDeleteBA(ieee, pRxTs);

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+3 −3
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ void TSInitialize(struct ieee80211_device *ieee) 
		timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,

			    0);

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

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

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

			    0);

		timer_setup(&pTxTS->tx_admitted_ba_record.Timer,

		timer_setup(&pTxTS->tx_admitted_ba_record.timer,

			    TxBaInactTimeout, 0);

		ResetTxTsEntry(pTxTS);

		list_add_tail(&pTxTS->ts_common_info.list, &ieee->Tx_TS_Unused_List);
@@ -171,7 +171,7 @@ void TSInitialize(struct ieee80211_device *ieee) 
			    0);

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

			    0);

		timer_setup(&pRxTS->rx_admitted_ba_record.Timer,

		timer_setup(&pRxTS->rx_admitted_ba_record.timer,

			    RxBaInactTimeout, 0);

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

		ResetRxTsEntry(pRxTS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE