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

staging: rtl8192e: rename RxTimeoutIndicateSeq to rx_timeout_indicate_seq in rx_ts_record struct 



Rename RxTimeoutIndicateSeq to rx_timeout_indicate_seq to silence a
checkpatch warning about CamelCase.

Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210301215335.767-4-will+git@drnd.me


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

drivers/staging/rtl8192e/rtl819x_TS.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct tx_ts_record { 
struct rx_ts_record {

	struct ts_common_info ts_common_info;

	u16				rx_indicate_seq;

	u16				RxTimeoutIndicateSeq;

	u16				rx_timeout_indicate_seq;

	struct list_head		RxPendingPktList;

	struct timer_list		RxPktPendingTimer;

	struct ba_record RxAdmittedBARecord;

drivers/staging/rtl8192e/rtl819x_TSProc.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void RxPktPendingTimeout(struct timer_list *t) 
	bool bPktInBuf = false;



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

	if (pRxTs->RxTimeoutIndicateSeq != 0xffff) {

	if (pRxTs->rx_timeout_indicate_seq != 0xffff) {

		while (!list_empty(&pRxTs->RxPendingPktList)) {

			pReorderEntry = (struct rx_reorder_entry *)

					list_entry(pRxTs->RxPendingPktList.prev,
@@ -66,7 +66,7 @@ static void RxPktPendingTimeout(struct timer_list *t) 
	}



	if (index > 0) {

		pRxTs->RxTimeoutIndicateSeq = 0xffff;

		pRxTs->rx_timeout_indicate_seq = 0xffff;



		if (index > REORDER_WIN_SIZE) {

			netdev_warn(ieee->dev,
@@ -80,8 +80,8 @@ static void RxPktPendingTimeout(struct timer_list *t) 
		bPktInBuf = false;

	}



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

		pRxTs->RxTimeoutIndicateSeq = pRxTs->rx_indicate_seq;

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

		pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;

		mod_timer(&pRxTs->RxPktPendingTimer,  jiffies +

			  msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime)

			  );
@@ -125,7 +125,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS) 
{

	ResetTsCommonInfo(&pTS->ts_common_info);

	pTS->rx_indicate_seq = 0xffff;

	pTS->RxTimeoutIndicateSeq = 0xffff;

	pTS->rx_timeout_indicate_seq = 0xffff;

	ResetBaEntry(&pTS->RxAdmittedBARecord);

}

drivers/staging/rtl8192e/rtllib_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	if (index > 0) {

		if (timer_pending(&pTS->RxPktPendingTimer))

			del_timer_sync(&pTS->RxPktPendingTimer);

		pTS->RxTimeoutIndicateSeq = 0xffff;

		pTS->rx_timeout_indicate_seq = 0xffff;



		if (index > REORDER_WIN_SIZE) {

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

	}



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

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

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

		pTS->RxTimeoutIndicateSeq = pTS->rx_indicate_seq;

		pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;

		mod_timer(&pTS->RxPktPendingTimer, jiffies +

			  msecs_to_jiffies(pHTInfo->RxReorderPendingTime));

	}