Skip to contentSkip to conversation

Staging: rtl8192e: Rename function TsInitDelBA

PATCH In review Tree Davies 2 participants 2 messages Jul 12, 2023 – Jul 13, 2023 Staging

lore
Share & tools
lore

Tree Davies

author
#0 lore raw

PATCH 5/12 Staging: rtl8192e: Rename function TsInitDelBA

Rename function TsInitDelBA to ts_init_del_ba in order to Fix checkpatch warning: Avoid CamelCase

Signed-off-by Tree Davies <[email protected]>
---
 drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +-
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
 drivers/staging/rtl8192e/rtllib.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl819x_BAProc.c +1 -1
index 2e37f1e949ec..9a32528fe314 100644
@@ -484,7 +484,7 @@ void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
 	rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);
 }
 
-void TsInitDelBA(struct rtllib_device *ieee,
+void ts_init_del_ba(struct rtllib_device *ieee,
 		 struct ts_common_info *pTsCommonInfo,
 		 enum tr_select TxRxSelect)
 {
drivers/staging/rtl8192e/rtl819x_TSProc.c +1 -1
index 7841d9ce1a7f..8005f7462aca 100644
@@ -396,7 +396,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
 {
 	del_timer_sync(&pTs->SetupTimer);
 	del_timer_sync(&pTs->InactTimer);
-	TsInitDelBA(ieee, pTs, TxRxSelect);
+	ts_init_del_ba(ieee, pTs, TxRxSelect);
 
 	if (TxRxSelect == RX_DIR) {
 		struct rx_reorder_entry *pRxReorderEntry;
drivers/staging/rtl8192e/rtllib.h +1 -1
index de0dd48d0646..42a9b1dafc27 100644
@@ -2010,7 +2010,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb);
 int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb);
 void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
 		 u8 Policy, u8 bOverwritePending);
-void TsInitDelBA(struct rtllib_device *ieee,
+void ts_init_del_ba(struct rtllib_device *ieee,
 		 struct ts_common_info *pTsCommonInfo,
 		 enum tr_select TxRxSelect);
 void BaSetupTimeOut(struct timer_list *t);
Signature · 1 line
2.41.0
#1 lore raw
Quoted 41 lines · Tree Davies

Rename function TsInitDelBA to ts_init_del_ba in order to Fix checkpatch warning: Avoid CamelCase

Signed-off-by Tree Davies <[email protected]>
---
  drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +-
  drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
  drivers/staging/rtl8192e/rtllib.h         | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl819x_BAProc.c +1 -1
index 2e37f1e949ec..9a32528fe314 100644
@@ -484,7 +484,7 @@ void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
  	rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);
  }
 
-void TsInitDelBA(struct rtllib_device *ieee,
+void ts_init_del_ba(struct rtllib_device *ieee,
  		 struct ts_common_info *pTsCommonInfo,
  		 enum tr_select TxRxSelect)
  {
drivers/staging/rtl8192e/rtl819x_TSProc.c +1 -1
index 7841d9ce1a7f..8005f7462aca 100644
@@ -396,7 +396,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
  {
  	del_timer_sync(&pTs->SetupTimer);
  	del_timer_sync(&pTs->InactTimer);
-	TsInitDelBA(ieee, pTs, TxRxSelect);
+	ts_init_del_ba(ieee, pTs, TxRxSelect);
 
  	if (TxRxSelect == RX_DIR) {
  		struct rx_reorder_entry *pRxReorderEntry;
drivers/staging/rtl8192e/rtllib.h +0 -0
index de0dd48d0646..42a9b1dafc27 100644

drivers/staging/rtl8192e/rtllib.h int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb); · line 2016

Quoted 8 lines
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -2010,7 +2010,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb);
  int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb);
  void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
  		 u8 Policy, u8 bOverwritePending);
-void TsInitDelBA(struct rtllib_device *ieee,
+void ts_init_del_ba(struct rtllib_device *ieee,
  		 struct ts_common_info *pTsCommonInfo,
  		 enum tr_select TxRxSelect);
  void BaSetupTimeOut(struct timer_list *t);

Hi Tree,

we need to wait which patches are accepted. I cannot apply this patch on the top of the patches already send and I assume those are accepted. See below:

kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v ~/Downloads/20230713-\[PATCH\ 05*
Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
Checking patch drivers/staging/rtl8192e/rtl819x_TSProc.c...
error: while searching for:
{
	del_timer_sync(&pTs->SetupTimer);
	del_timer_sync(&pTs->InactTimer);
	TsInitDelBA(ieee, pTs, TxRxSelect);
	if (TxRxSelect == RX_DIR) {
		struct rx_reorder_entry *pRxReorderEntry;

error: patch failed: drivers/staging/rtl8192e/rtl819x_TSProc.c:396
error: drivers/staging/rtl8192e/rtl819x_TSProc.c: patch does not apply Checking patch drivers/staging/rtl8192e/rtllib.h...
Hunk #1 succeeded at 2004 (offset -6 lines). kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$

So better wait for Greg to choose which ones will be accepted.

Bye Philipp