Commit 959e4565 authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Rename variable pTS in function RxReorderIndicatePacket() 



Rename variable pTS in function RxReorderIndicatePacket() to ts
to fix checkpatch warning Avoid CamelCase.

Signed-off-by: default avatarTree Davies <tdavies@darkphysics.net>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20230825140847.501113-15-tdavies@darkphysics.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90b35a75

drivers/staging/rtl8192e/rtllib_rx.c

+29 −29
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, 


static void RxReorderIndicatePacket(struct rtllib_device *ieee,

				    struct rtllib_rxb *prxb,

				    struct rx_ts_record *pTS, u16 SeqNum)

				    struct rx_ts_record *ts, u16 SeqNum)

{

	struct rt_hi_throughput *ht_info = ieee->ht_info;

	struct rx_reorder_entry *pReorderEntry = NULL;
@@ -565,21 +565,21 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	unsigned long flags;



	netdev_dbg(ieee->dev,

		   "%s(): Seq is %d, pTS->rx_indicate_seq is %d, WinSize is %d\n",

		   __func__, SeqNum, pTS->rx_indicate_seq, WinSize);

		   "%s(): Seq is %d, ts->rx_indicate_seq is %d, WinSize is %d\n",

		   __func__, SeqNum, ts->rx_indicate_seq, WinSize);



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



	WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096;

	WinEnd = (ts->rx_indicate_seq + WinSize - 1) % 4096;

	/* Rx Reorder initialize condition.*/

	if (pTS->rx_indicate_seq == 0xffff)

		pTS->rx_indicate_seq = SeqNum;

	if (ts->rx_indicate_seq == 0xffff)

		ts->rx_indicate_seq = SeqNum;



	/* Drop out the packet which SeqNum is smaller than WinStart */

	if (SN_LESS(SeqNum, pTS->rx_indicate_seq)) {

	if (SN_LESS(SeqNum, ts->rx_indicate_seq)) {

		netdev_dbg(ieee->dev,

			   "Packet Drop! IndicateSeq: %d, NewSeq: %d\n",

			   pTS->rx_indicate_seq, SeqNum);

			   ts->rx_indicate_seq, SeqNum);

		ht_info->rx_reorder_drop_counter++;

		{

			int i;
@@ -597,18 +597,18 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	 * 1. Incoming SeqNum is equal to WinStart =>Window shift 1

	 * 2. Incoming SeqNum is larger than the WinEnd => Window shift N

	 */

	if (SN_EQUAL(SeqNum, pTS->rx_indicate_seq)) {

		pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) % 4096;

	if (SN_EQUAL(SeqNum, ts->rx_indicate_seq)) {

		ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) % 4096;

		bMatchWinStart = true;

	} else if (SN_LESS(WinEnd, SeqNum)) {

		if (SeqNum >= (WinSize - 1))

			pTS->rx_indicate_seq = SeqNum + 1 - WinSize;

			ts->rx_indicate_seq = SeqNum + 1 - WinSize;

		else

			pTS->rx_indicate_seq = 4095 -

			ts->rx_indicate_seq = 4095 -

					     (WinSize - (SeqNum + 1)) + 1;

		netdev_dbg(ieee->dev,

			   "Window Shift! IndicateSeq: %d, NewSeq: %d\n",

			   pTS->rx_indicate_seq, SeqNum);

			   ts->rx_indicate_seq, SeqNum);

	}



	/* Indication process.
@@ -625,7 +625,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
		/* Current packet is going to be indicated.*/

		netdev_dbg(ieee->dev,

			   "Packets indication! IndicateSeq: %d, NewSeq: %d\n",

			   pTS->rx_indicate_seq, SeqNum);

			   ts->rx_indicate_seq, SeqNum);

		ieee->prxbIndicateArray[0] = prxb;

		index = 1;

	} else {
@@ -642,12 +642,12 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
			pReorderEntry->SeqNum = SeqNum;

			pReorderEntry->prxb = prxb;



			if (!AddReorderEntry(pTS, pReorderEntry)) {

			if (!AddReorderEntry(ts, pReorderEntry)) {

				int i;



				netdev_dbg(ieee->dev,

					   "%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n",

					   __func__, pTS->rx_indicate_seq,

					   __func__, ts->rx_indicate_seq,

					   SeqNum);

				list_add_tail(&pReorderEntry->List,

					      &ieee->RxReorder_Unused_List);
@@ -659,7 +659,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
			} else {

				netdev_dbg(ieee->dev,

					   "Pkt insert into struct buffer. IndicateSeq: %d, NewSeq: %d\n",

					   pTS->rx_indicate_seq, SeqNum);

					   ts->rx_indicate_seq, SeqNum);

			}

		} else {

			/* Packets are dropped if there are not enough reorder
@@ -682,16 +682,16 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	}



	/* Check if there is any packet need indicate.*/

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

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

		netdev_dbg(ieee->dev, "%s(): start RREORDER indicate\n",

			   __func__);



		pReorderEntry = (struct rx_reorder_entry *)

					list_entry(pTS->rx_pending_pkt_list.prev,

					list_entry(ts->rx_pending_pkt_list.prev,

						   struct rx_reorder_entry,

						   List);

		if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) ||

		    SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq)) {

		if (SN_LESS(pReorderEntry->SeqNum, ts->rx_indicate_seq) ||

		    SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) {

			/* This protect struct buffer from overflow. */

			if (index >= REORDER_WIN_SIZE) {

				netdev_err(ieee->dev,
@@ -703,8 +703,8 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 


			list_del_init(&pReorderEntry->List);



			if (SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq))

				pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) %

			if (SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq))

				ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) %

						     4096;



			ieee->prxbIndicateArray[index] = pReorderEntry->prxb;
@@ -724,9 +724,9 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	 * Rx buffering.

	 */

	if (index > 0) {

		if (timer_pending(&pTS->rx_pkt_pending_timer))

			del_timer_sync(&pTS->rx_pkt_pending_timer);

		pTS->rx_timeout_indicate_seq = 0xffff;

		if (timer_pending(&ts->rx_pkt_pending_timer))

			del_timer_sync(&ts->rx_pkt_pending_timer);

		ts->rx_timeout_indicate_seq = 0xffff;



		if (index > REORDER_WIN_SIZE) {

			netdev_err(ieee->dev,
@@ -740,10 +740,10 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
		bPktInBuf = false;

	}



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

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

		netdev_dbg(ieee->dev, "%s(): SET rx timeout timer\n", __func__);

		pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;

		mod_timer(&pTS->rx_pkt_pending_timer, jiffies +

		ts->rx_timeout_indicate_seq = ts->rx_indicate_seq;

		mod_timer(&ts->rx_pkt_pending_timer, jiffies +

			  msecs_to_jiffies(ht_info->rx_reorder_pending_time));

	}

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