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

staging:rtl8192u: Rename RxPktPendingTimer - Style 



Rename the member variable RxPktPendingTimer to rx_pkt_pending_timer.
This change clears the checkpatch issue with CamelCase naming.

The resulting changes are coding style changes in nature so 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 a1ac7d1c

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+5 −5
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, 
	/* Handling pending timer. Set this timer to prevent from long time Rx buffering.*/

	if (index>0) {

		// Cancel previous pending timer.

	//	del_timer_sync(&pTS->RxPktPendingTimer);

	//	del_timer_sync(&pTS->rx_pkt_pending_timer);

		pTS->rx_timeout_indicate_seq = 0xffff;



		// Indicate packets
@@ -756,11 +756,11 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, 
		// Set new pending timer.

		IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): SET rx timeout timer\n", __func__);

		pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;

		if(timer_pending(&pTS->RxPktPendingTimer))

			del_timer_sync(&pTS->RxPktPendingTimer);

		pTS->RxPktPendingTimer.expires = jiffies +

		if(timer_pending(&pTS->rx_pkt_pending_timer))

			del_timer_sync(&pTS->rx_pkt_pending_timer);

		pTS->rx_pkt_pending_timer.expires = jiffies +

				msecs_to_jiffies(pHTInfo->RxReorderPendingTime);

		add_timer(&pTS->RxPktPendingTimer);

		add_timer(&pTS->rx_pkt_pending_timer);

	}



	kfree(prxbIndicateArray);

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct rx_ts_record { 
	u16				rx_indicate_seq;

	u16				rx_timeout_indicate_seq;

	struct list_head		rx_pending_pkt_list;

	struct timer_list		RxPktPendingTimer;

	struct timer_list		rx_pkt_pending_timer;

	BA_RECORD			RxAdmittedBARecord;	 /*  For BA Recipient */

	u16				RxLastSeqNum;

	u8				RxLastFragNum;

drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c

+5 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static void TsInactTimeout(struct timer_list *unused) 
 ********************************************************************************************************************/

static void RxPktPendingTimeout(struct timer_list *t)

{

	struct rx_ts_record     *pRxTs = from_timer(pRxTs, t, RxPktPendingTimer);

	struct rx_ts_record     *pRxTs = from_timer(pRxTs, t, rx_pkt_pending_timer);

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



	PRX_REORDER_ENTRY	pReorderEntry = NULL;
@@ -78,7 +78,7 @@ static void RxPktPendingTimeout(struct timer_list *t) 


	if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) {

		pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;

		mod_timer(&pRxTs->RxPktPendingTimer,

		mod_timer(&pRxTs->rx_pkt_pending_timer,

			  jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime));

	}

	spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
@@ -173,7 +173,7 @@ void TSInitialize(struct ieee80211_device *ieee) 
			    0);

		timer_setup(&pRxTS->RxAdmittedBARecord.Timer,

			    RxBaInactTimeout, 0);

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

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

		ResetRxTsEntry(pRxTS);

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

		pRxTS++;
@@ -420,8 +420,8 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * 
//#ifdef TO_DO_LIST

		PRX_REORDER_ENTRY	pRxReorderEntry;

		struct rx_ts_record     *pRxTS = (struct rx_ts_record *)pTs;

		if(timer_pending(&pRxTS->RxPktPendingTimer))

			del_timer_sync(&pRxTS->RxPktPendingTimer);

		if(timer_pending(&pRxTS->rx_pkt_pending_timer))

			del_timer_sync(&pRxTS->rx_pkt_pending_timer);



		while(!list_empty(&pRxTS->rx_pending_pkt_list)) {

			spin_lock_irqsave(&(ieee->reorder_spinlock), flags);