Commit a318d0b1 authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rename Timer to timer in ba_record struct

parent 53c72c4c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,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;
+5 −5
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ static void ActivateBAEntry(struct rtllib_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));
}

static void DeActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA)
{
	pBA->bValid = false;
	del_timer_sync(&pBA->Timer);
	del_timer_sync(&pBA->timer);
}

static u8 TxTsDeleteBA(struct rtllib_device *ieee, struct tx_ts_record *pTxTs)
@@ -522,7 +522,7 @@ void TsInitDelBA(struct rtllib_device *ieee,
void BaSetupTimeOut(struct timer_list *t)
{
	struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
					      TxPendingBARecord.Timer);
					      TxPendingBARecord.timer);

	pTxTs->bAddBaReqInProgress = false;
	pTxTs->bAddBaReqDelayed = true;
@@ -532,7 +532,7 @@ void BaSetupTimeOut(struct timer_list *t)
void TxBaInactTimeout(struct timer_list *t)
{
	struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
					      TxAdmittedBARecord.Timer);
					      TxAdmittedBARecord.timer);
	struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,
				     TxTsRecord[pTxTs->num]);
	TxTsDeleteBA(ieee, pTxTs);
@@ -544,7 +544,7 @@ void TxBaInactTimeout(struct timer_list *t)
void RxBaInactTimeout(struct timer_list *t)
{
	struct rx_ts_record *pRxTs = from_timer(pRxTs, t,
					      RxAdmittedBARecord.Timer);
					      RxAdmittedBARecord.timer);
	struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device,
				     RxTsRecord[pRxTs->num]);

+3 −3
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ void TSInitialize(struct rtllib_device *ieee)

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

		timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
		timer_setup(&pTxTS->TxPendingBARecord.timer, BaSetupTimeOut,
			    0);
		timer_setup(&pTxTS->TxAdmittedBARecord.Timer,
		timer_setup(&pTxTS->TxAdmittedBARecord.timer,
			    TxBaInactTimeout, 0);

		ResetTxTsEntry(pTxTS);
@@ -175,7 +175,7 @@ void TSInitialize(struct rtllib_device *ieee)
		timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout,
			    0);

		timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
		timer_setup(&pRxTS->RxAdmittedBARecord.timer,
			    RxBaInactTimeout, 0);

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