Skip to contentSkip to conversation

staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*

bug report New Dan Carpenter 3 participants 11 messages Mar 25, 2021 – Mar 26, 2021 Staging

lore
Share & tools
lore
#0 lore raw

Hello Fabio Aiuto,

The patch 65f183001f6e: "staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*" from Mar 16, 2021, leads to the following static checker warning:

	drivers/staging/rtl8723bs/core/rtw_ap.c:911 start_bss_network()
	warn: inconsistent indenting

drivers/staging/rtl8723bs/core/rtw_ap.c
904 rtw_get_capability((struct wlan_bssid_ex *)pnetwork)
905 );
906
907 if (pmlmeext->bstart_bss) {
908 update_beacon(padapter, WLAN_EID_TIM, NULL, true);
909
910 /* issue beacon frame */

The patch accidentally deleted these extra tab for this block.

   911          if (send_beacon(padapter) == _FAIL)
   912                  DBG_871X("issue_beacon, fail!\n");
   913  
   914          }
   915  
   916          /* update bc/mc sta_info */
   917          update_bmc_sta(padapter);
   918  

regards,
dan carpenter

#1 lore raw

PATCH 1/1 staging: rtl8723bs: fix indentation broken by previous patch

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
index 3cd9c61eec99..dc56477eb084 100644
@@ -907,9 +907,9 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
 	if (pmlmeext->bstart_bss) {
 		update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-	/* issue beacon frame */
-	if (send_beacon(padapter) == _FAIL)
-		DBG_871X("issue_beacon, fail!\n");
+		/* issue beacon frame */
+		if (send_beacon(padapter) == _FAIL)
+			DBG_871X("issue_beacon, fail!\n");
 
 	}
 
Signature · 1 line
2.20.1
#2 lore raw
In reply to Dan Carpenter
Quoted 29 lines · Dan Carpenter

Hello Fabio Aiuto,

The patch 65f183001f6e: "staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*" from Mar 16, 2021, leads to the following static checker warning:

	drivers/staging/rtl8723bs/core/rtw_ap.c:911 start_bss_network()
	warn: inconsistent indenting

drivers/staging/rtl8723bs/core/rtw_ap.c
904 rtw_get_capability((struct wlan_bssid_ex *)pnetwork)

   905          );
   906  
   907          if (pmlmeext->bstart_bss) {
   908                  update_beacon(padapter, WLAN_EID_TIM, NULL, true);
   909  
   910          /* issue beacon frame */

The patch accidentally deleted these extra tab for this block.

   911          if (send_beacon(padapter) == _FAIL)
   912                  DBG_871X("issue_beacon, fail!\n");
   913  
   914          }
   915  
   916          /* update bc/mc sta_info */
   917          update_bmc_sta(padapter);
   918  
Quoted 2 lines

regards,
dan carpenter

Thank you Dan,

sent yesterday a fix,

sorry for late,

fabio

#4 lore raw

PATCH 1/1 staging: rtl8723bs: fix indentation broken by previous patch

In reply to Dan Carpenter

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
index 3cd9c61eec99..dc56477eb084 100644
@@ -907,9 +907,9 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
 	if (pmlmeext->bstart_bss) {
 		update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-	/* issue beacon frame */
-	if (send_beacon(padapter) == _FAIL)
-		DBG_871X("issue_beacon, fail!\n");
+		/* issue beacon frame */
+		if (send_beacon(padapter) == _FAIL)
+			DBG_871X("issue_beacon, fail!\n");
 
 	}
 
Signature · 1 line
2.20.1
#3 lore raw
In reply to Fabio Aiuto
Quoted 30 lines · Fabio Aiuto
Quoted 29 lines · Dan Carpenter

Hello Fabio Aiuto,

The patch 65f183001f6e: "staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*" from Mar 16, 2021, leads to the following static checker warning:

	drivers/staging/rtl8723bs/core/rtw_ap.c:911 start_bss_network()
	warn: inconsistent indenting

drivers/staging/rtl8723bs/core/rtw_ap.c
904 rtw_get_capability((struct wlan_bssid_ex *)pnetwork)

   905          );
   906  
   907          if (pmlmeext->bstart_bss) {
   908                  update_beacon(padapter, WLAN_EID_TIM, NULL, true);
   909  
   910          /* issue beacon frame */

The patch accidentally deleted these extra tab for this block.

   911          if (send_beacon(padapter) == _FAIL)
   912                  DBG_871X("issue_beacon, fail!\n");
   913  
   914          }
   915  
   916          /* update bc/mc sta_info */
   917          update_bmc_sta(padapter);
   918  
Quoted 7 lines
Quoted 2 lines

regards,
dan carpenter

Thank you Dan,

sent yesterday a fix,

Thanks!

regards,
dan carpenter

maintainer
#5 lore raw

Re: [PATCH] staging: rtl8723bs: fix indentation broken by previous patch

In reply to Fabio Aiuto
Quoted 7 lines · Fabio Aiuto

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

"previous patch" is not very descriptive :(

Please put a "Fixes:" tag in here to point out exactly what commit this fixed, and maybe a "Reported-by:" tag if someone pointed this out to you...

thanks,

greg k-h

#6 lore raw

PATCH 1/1 Fixes: 65f183001f6e (staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*)

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
index 3cd9c61eec99..dc56477eb084 100644
@@ -907,9 +907,9 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
 	if (pmlmeext->bstart_bss) {
 		update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-	/* issue beacon frame */
-	if (send_beacon(padapter) == _FAIL)
-		DBG_871X("issue_beacon, fail!\n");
+		/* issue beacon frame */
+		if (send_beacon(padapter) == _FAIL)
+			DBG_871X("issue_beacon, fail!\n");
 
 	}
 
Signature · 1 line
2.20.1
maintainer
#7 lore raw

Re: [PATCH] Fixes: 65f183001f6e (staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*)

Quoted 5 lines · Fabio Aiuto

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

No, please use a "Fixes:" tag that points to the git commit id that this commit fixes. Look in the kernel tree for loads of examples of how to do this, and it's even documented in the Documentation/ process guide as well.

thanks,

greg k-h

#8 lore raw

Re: [PATCH] Fixes: 65f183001f6e (staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*)

Quoted 7 lines · Greg KH
Quoted 5 lines · Fabio Aiuto

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

Quoted 8 lines

No, please use a "Fixes:" tag that points to the git commit id that this commit fixes. Look in the kernel tree for loads of examples of how to do this, and it's even documented in the Documentation/ process guide as well.

thanks,

greg k-h

is what I did, as you can see in the subject. Or I did wrong?

thank you,

fabio

#9 lore raw

Re: [PATCH] Fixes: 65f183001f6e (staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*)

Quoted 15 lines · Fabio Aiuto
Quoted 14 lines · Greg KH
Quoted 5 lines · Fabio Aiuto

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiuto83@gmail.com

No, please use a "Fixes:" tag that points to the git commit id that this commit fixes. Look in the kernel tree for loads of examples of how to do this, and it's even documented in the Documentation/ process guide as well.

thanks,

Quoted 7 lines
Quoted 1 line

greg k-h

is what I did, as you can see in the subject. Or I did wrong?

thank you,

fabio

forget this message :( I will send you the patch correctly formatted, just seen some examples. I thought the 'Fixes: ...' was the one line desc.

thank you

fabio

#10 lore raw

PATCH 1/1 staging: rtl8723bs: fix broken indentation

In reply to Greg KH

fix indentation broken by patch removing conditional code blocks checked by unused CONFIG_INTERRUPT_BASED_TXBCN family defines

Fixes 65f183001f6e (staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*)
---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
index 3cd9c61eec99..dc56477eb084 100644
@@ -907,9 +907,9 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
 	if (pmlmeext->bstart_bss) {
 		update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-	/* issue beacon frame */
-	if (send_beacon(padapter) == _FAIL)
-		DBG_871X("issue_beacon, fail!\n");
+		/* issue beacon frame */
+		if (send_beacon(padapter) == _FAIL)
+			DBG_871X("issue_beacon, fail!\n");
 
 	}
 
Signature · 1 line
2.20.1