staging:rtl8192u: Rename TsAddBaTimer - Style (1c194ce9) · Commits · 戴 / test

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -597,8 +597,8 @@ int ieee80211_rx_DELBA(struct ieee80211_device ieee, struct sk_buff skb)
		pTxTs->using_ba = false;
		pTxTs->add_ba_req_in_progress = false;
		pTxTs->add_ba_req_delayed = false;
		del_timer_sync(&pTxTs->TsAddBaTimer);
		//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer);
		del_timer_sync(&pTxTs->ts_add_ba_timer);
		//PlatformCancelTimer(Adapter, &pTxTs->ts_add_ba_timer);
		TxTsDeleteBA(ieee, pTxTs);
		}
		return 0;

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ struct tx_ts_record {
		u8 add_ba_req_in_progress;
		u8 add_ba_req_delayed;
		u8 using_ba;
		struct timer_list TsAddBaTimer;
		struct timer_list ts_add_ba_timer;
		u8 num;
		};

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
		********************************************************************************************************************/
		static void TsAddBaProcess(struct timer_list *t)
		{
		struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
		struct tx_ts_record *pTxTs = from_timer(pTxTs, t, ts_add_ba_timer);
		u8 num = pTxTs->num;
		struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);

		@@ -150,7 +150,7 @@ void TSInitialize(struct ieee80211_device *ieee)
		0);
		timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,
		0);
		timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
		timer_setup(&pTxTS->ts_add_ba_timer, TsAddBaProcess, 0);
		timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,
		0);
		timer_setup(&pTxTS->tx_admitted_ba_record.Timer,
		@@ -448,7 +448,7 @@ static void RemoveTsEntry(struct ieee80211_device ieee, struct ts_common_info
		//#endif
		} else {
		struct tx_ts_record pTxTS = (struct tx_ts_record )pTs;
		del_timer_sync(&pTxTS->TsAddBaTimer);
		del_timer_sync(&pTxTS->ts_add_ba_timer);
		}
		}

		@@ -526,11 +526,11 @@ void TsStartAddBaProcess(struct ieee80211_device ieee, struct tx_ts_record pTx
		pTxTS->add_ba_req_in_progress = true;
		if(pTxTS->add_ba_req_delayed) {
		IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");
		mod_timer(&pTxTS->TsAddBaTimer,
		mod_timer(&pTxTS->ts_add_ba_timer,
		jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));
		} else {
		IEEE80211_DEBUG(IEEE80211_DL_BA,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
		mod_timer(&pTxTS->TsAddBaTimer, jiffies+10); //set 10 ticks
		mod_timer(&pTxTS->ts_add_ba_timer, jiffies+10); //set 10 ticks
		}
		} else {
		IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __func__);

Admin message