Commit 8e231840 authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Rename variable TxRxSelect 



Rename variable TxRxSelect to tx_rx_select 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/20240229024325.453374-3-tdavies@darkphysics.net


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

drivers/staging/rtl8192e/rtl819x_BAProc.c

+9 −9
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *dst, 


static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,

				    struct ba_record *ba,

				    enum tr_select TxRxSelect, u16 reason_code)

				    enum tr_select tx_rx_select, u16 reason_code)

{

	union delba_param_set del_ba_param_set;

	struct sk_buff *skb = NULL;
@@ -139,7 +139,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, 


	memset(&del_ba_param_set, 0, 2);



	del_ba_param_set.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0;

	del_ba_param_set.field.initiator = (tx_rx_select == TX_DIR) ? 1 : 0;

	del_ba_param_set.field.tid	= ba->ba_param_set.field.tid;



	skb = dev_alloc_skb(len + sizeof(struct ieee80211_hdr_3addr));
@@ -199,12 +199,12 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst, 
}



static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,

			      struct ba_record *ba, enum tr_select TxRxSelect,

			      struct ba_record *ba, enum tr_select tx_rx_select,

			      u16 reason_code)

{

	struct sk_buff *skb;



	skb = rtllib_DELBA(ieee, dst, ba, TxRxSelect, reason_code);

	skb = rtllib_DELBA(ieee, dst, ba, tx_rx_select, reason_code);

	if (skb)

		softmac_mgmt_xmit(skb, ieee);

	else
@@ -486,9 +486,9 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts, 


void rtllib_ts_init_del_ba(struct rtllib_device *ieee,

			   struct ts_common_info *ts_common_info,

			   enum tr_select TxRxSelect)

			   enum tr_select tx_rx_select)

{

	if (TxRxSelect == TX_DIR) {

	if (tx_rx_select == TX_DIR) {

		struct tx_ts_record *ts =

			 (struct tx_ts_record *)ts_common_info;
@@ -497,14 +497,14 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee, 
					  (ts->tx_admitted_ba_record.b_valid) ?

					 (&ts->tx_admitted_ba_record) :

					(&ts->tx_pending_ba_record),

					 TxRxSelect, DELBA_REASON_END_BA);

	} else if (TxRxSelect == RX_DIR) {

					 tx_rx_select, DELBA_REASON_END_BA);

	} else if (tx_rx_select == RX_DIR) {

		struct rx_ts_record *ts =

				 (struct rx_ts_record *)ts_common_info;

		if (rx_ts_delete_ba(ieee, ts))

			rtllib_send_DELBA(ieee, ts_common_info->addr,

					  &ts->rx_admitted_ba_record,

					  TxRxSelect, DELBA_REASON_END_BA);

					  tx_rx_select, DELBA_REASON_END_BA);

	}

}

drivers/staging/rtl8192e/rtl819x_TSProc.c

+12 −12
Original line number Diff line number Diff line
@@ -171,14 +171,14 @@ void rtllib_ts_init(struct rtllib_device *ieee) 


static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,

						  u8 *addr, u8 TID,

						  enum tr_select TxRxSelect)

						  enum tr_select tx_rx_select)

{

	u8	dir;

	bool	search_dir[4] = {0};

	struct list_head *psearch_list;

	struct ts_common_info *pRet = NULL;



	if (TxRxSelect == TX_DIR) {

	if (tx_rx_select == TX_DIR) {

		search_dir[DIR_UP] = true;

		search_dir[DIR_BI_DIR] = true;

		search_dir[DIR_DIRECT] = true;
@@ -188,7 +188,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, 
		search_dir[DIR_DIRECT] = true;

	}



	if (TxRxSelect == TX_DIR)

	if (tx_rx_select == TX_DIR)

		psearch_list = &ieee->Tx_TS_Admit_List;

	else

		psearch_list = &ieee->Rx_TS_Admit_List;
@@ -225,7 +225,7 @@ static void MakeTSEntry(struct ts_common_info *ts_common_info, u8 *addr, 
}



bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,

	   u8 *addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs)

	   u8 *addr, u8 TID, enum tr_select tx_rx_select, bool bAddNewTs)

{

	u8	UP = 0;

	struct qos_tsinfo tspec;
@@ -265,7 +265,7 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
		}

	}



	*ppTS = SearchAdmitTRStream(ieee, addr, UP, TxRxSelect);

	*ppTS = SearchAdmitTRStream(ieee, addr, UP, tx_rx_select);

	if (*ppTS)

		return true;
@@ -274,21 +274,21 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
		return false;

	}



	pUnusedList = (TxRxSelect == TX_DIR) ?

	pUnusedList = (tx_rx_select == TX_DIR) ?

				(&ieee->Tx_TS_Unused_List) :

				(&ieee->Rx_TS_Unused_List);



	pAddmitList = (TxRxSelect == TX_DIR) ?

	pAddmitList = (tx_rx_select == TX_DIR) ?

				(&ieee->Tx_TS_Admit_List) :

				(&ieee->Rx_TS_Admit_List);



	Dir = ((TxRxSelect == TX_DIR) ? DIR_UP : DIR_DOWN);

	Dir = ((tx_rx_select == TX_DIR) ? DIR_UP : DIR_DOWN);



	if (!list_empty(pUnusedList)) {

		(*ppTS) = list_entry(pUnusedList->next,

			  struct ts_common_info, list);

		list_del_init(&(*ppTS)->list);

		if (TxRxSelect == TX_DIR) {

		if (tx_rx_select == TX_DIR) {

			struct tx_ts_record *tmp =

				container_of(*ppTS,

				struct tx_ts_record,
@@ -321,11 +321,11 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
}



static void RemoveTsEntry(struct rtllib_device *ieee,

			  struct ts_common_info *pTs, enum tr_select TxRxSelect)

			  struct ts_common_info *pTs, enum tr_select tx_rx_select)

{

	rtllib_ts_init_del_ba(ieee, pTs, TxRxSelect);

	rtllib_ts_init_del_ba(ieee, pTs, tx_rx_select);



	if (TxRxSelect == RX_DIR) {

	if (tx_rx_select == RX_DIR) {

		struct rx_reorder_entry *pRxReorderEntry;

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

drivers/staging/rtl8192e/rtllib.h

+2 −2
Original line number Diff line number Diff line
@@ -1762,13 +1762,13 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts, 
			   u8 policy, u8 overwrite_pending);

void rtllib_ts_init_del_ba(struct rtllib_device *ieee,

			   struct ts_common_info *ts_common_info,

			   enum tr_select TxRxSelect);

			   enum tr_select tx_rx_select);

void rtllib_ba_setup_timeout(struct timer_list *t);

void rtllib_tx_ba_inact_timeout(struct timer_list *t);

void rtllib_rx_ba_inact_timeout(struct timer_list *t);

void rtllib_reset_ba_entry(struct ba_record *ba);

bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *addr,

	   u8 TID, enum tr_select TxRxSelect, bool bAddNewTs);

	   u8 TID, enum tr_select tx_rx_select, bool bAddNewTs);

void rtllib_ts_init(struct rtllib_device *ieee);

void TsStartAddBaProcess(struct rtllib_device *ieee,

			 struct tx_ts_record *pTxTS);