linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/12] Remove more unused code blocks
@ 2021-03-16 15:29 Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST Fabio Aiuto
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:29 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

Remove unused code clocks, as required in TODO list:

	find and remove code blocks guarded by never set CONFIG_FOO defines

Fabio Aiuto (12):
  staging: rtl8723bs: remove unused code blocks
    conditioned by never set CONFIG_CMCC_TEST
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_INTERRUPT_BASED_TXBCN*
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_DISABLE_MCS13TO15
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_VALIDATE_SSID
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_LAYER2_ROAMING_ACTIVE
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_USB_VENDOR*
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_SINGLE_RECV_BUF
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_RX_INDICATE_QUEUE
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_BSD_RX_USE_MBUF
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_R871X_TEST
  staging: rtl8723bs: remove unused code blocks conditioned by never set
    CONFIG_MULTI_VIR_IFACES

 drivers/staging/rtl8723bs/core/rtw_ap.c       | 30 ++------------
 .../staging/rtl8723bs/core/rtw_ioctl_set.c    | 11 -----
 drivers/staging/rtl8723bs/core/rtw_mlme.c     | 19 +--------
 .../staging/rtl8723bs/core/rtw_wlan_util.c    | 15 -------
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 -------------------
 drivers/staging/rtl8723bs/include/drv_conf.h  | 10 -----
 drivers/staging/rtl8723bs/include/drv_types.h |  3 --
 .../staging/rtl8723bs/include/osdep_intf.h    |  6 ---
 drivers/staging/rtl8723bs/include/rtw_recv.h  | 17 +-------
 9 files changed, 6 insertions(+), 145 deletions(-)

-- 
2.20.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
@ 2021-03-16 15:30 ` Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 02/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN* Fabio Aiuto
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:30 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_CMCC_TEST

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 6f08af686f9d..5904b7f9f134 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2115,16 +2115,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_l
 	rate_bitmap = hal_btcoex_GetRaMask(padapter);
 	mask &= ~rate_bitmap;
 
-#ifdef CONFIG_CMCC_TEST
-	if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {
-		if (mac_id == 0) {
-			DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", mask);
-			mask &= 0xffffff00; /* disable CCK & <24M OFDM rate for 11G mode for CMCC */
-			DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", mask);
-		}
-	}
-#endif
-
 	if (pHalData->fw_ractrl) {
 		rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mode, shortGIrate, mask);
 	}
@@ -3082,10 +3072,6 @@ static void rtl8723b_fill_default_txdesc(
 				ptxdesc->data_ldpc = 1;
 			if (pattrib->stbc)
 				ptxdesc->data_stbc = 1;
-
-#ifdef CONFIG_CMCC_TEST
-			ptxdesc->data_short = 1; /* use cck short premble */
-#endif
 		} else {
 			/*  EAP data packet and ARP packet. */
 			/*  Use the 1M data rate to send the EAP/ARP packet. */
@@ -3767,11 +3753,6 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 		BrateCfg &= rrsr_2g_allow_mask;
 		masked = BrateCfg;
 
-		#ifdef CONFIG_CMCC_TEST
-		BrateCfg |= (RRSR_11M|RRSR_5_5M|RRSR_1M); /* use 11M to send ACK */
-		BrateCfg |= (RRSR_24M|RRSR_18M|RRSR_12M); /* CMCC_OFDM_ACK 12/18/24M */
-		#endif
-
 		/* IOT consideration */
 		if (mlmext_info->assoc_AP_vendor == HT_IOT_PEER_CISCO) {
 			/* if peer is cisco and didn't use ofdm rate, we enable 6M ack */
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 02/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST Fabio Aiuto
@ 2021-03-16 15:30 ` Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 03/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15 Fabio Aiuto
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:30 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_INTERRUPT_BASED_TXBCN family defines

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_ap.c       | 30 ++-----------------
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 21 -------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 63b339484289..74f0f4d5a0b3 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -920,12 +920,10 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
 	if (pmlmeext->bstart_bss) {
 		update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will  tx beacon when bcn interrupt coming in. */
-		/* 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");
 
-#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 	}
 
 	/* update bc/mc sta_info */
@@ -1685,26 +1683,6 @@ static void update_bcn_wps_ie(struct adapter *padapter)
 	}
 
 	kfree(pbackup_remainder_ie);
-
-	/*  deal with the case without set_tx_beacon_cmd() in update_beacon() */
-#if defined(CONFIG_INTERRUPT_BASED_TXBCN)
-	if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
-		u8 sr = 0;
-
-		rtw_get_wps_attr_content(
-			pwps_ie_src,
-			wps_ielen,
-			WPS_ATTR_SELECTED_REGISTRAR,
-			(u8 *)(&sr),
-			NULL
-		);
-
-		if (sr) {
-			set_fwstate(pmlmepriv, WIFI_UNDER_WPS);
-			DBG_871X("%s, set WIFI_UNDER_WPS\n", __func__);
-		}
-	}
-#endif
 }
 
 static void update_bcn_p2p_ie(struct adapter *padapter)
@@ -1802,12 +1780,10 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
 
 	spin_unlock_bh(&pmlmepriv->bcn_update_lock);
 
-#ifndef CONFIG_INTERRUPT_BASED_TXBCN
 	if (tx) {
 		/* send_beacon(padapter);//send_beacon must execute on TSR level */
 		set_tx_beacon_cmd(padapter);
 	}
-#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 }
 
 /*
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 5904b7f9f134..2b81be6f1b32 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -3272,17 +3272,6 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)
 		if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) {
 			{
 				StopTxBeacon(padapter);
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
-				rtw_write8(padapter, REG_DRVERLYINT, 0x05); /*  restore early int time to 5ms */
-				UpdateInterruptMask8812AU(padapter, true, 0, IMR_BCNDMAINT0_8723B);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */
-
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
-				UpdateInterruptMask8812AU(padapter, true, 0, (IMR_TXBCN0ERR_8723B|IMR_TXBCN0OK_8723B));
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */
-
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN */
 			}
 
 			/*  disable atim wnd */
@@ -3292,16 +3281,6 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)
 			ResumeTxBeacon(padapter);
 			rtw_write8(padapter, REG_BCN_CTRL, DIS_TSF_UDT|EN_BCN_FUNCTION|DIS_BCNQ_SUB);
 		} else if (mode == _HW_STATE_AP_) {
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
-			UpdateInterruptMask8723BU(padapter, true, IMR_BCNDMAINT0_8723B, 0);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */
-
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
-			UpdateInterruptMask8723BU(padapter, true, (IMR_TXBCN0ERR_8723B|IMR_TXBCN0OK_8723B), 0);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */
-
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN */
 
 			ResumeTxBeacon(padapter);
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 03/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 02/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN* Fabio Aiuto
@ 2021-03-16 15:30 ` Fabio Aiuto
  2021-03-16 15:30 ` [PATCH 04/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ Fabio Aiuto
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:30 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_DISABLE_MCS13TO15

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c      | 16 +---------------
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c |  7 -------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 725f699abda9..a9e5c27a42f7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2679,14 +2679,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 		if (stbc_rx_enable)
 			ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_2R);/* RX STBC two spatial stream */
 
-		#ifdef CONFIG_DISABLE_MCS13TO15
-		if (((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) && (pregistrypriv->wifi_spec != 1))
-				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R_13TO15_OFF);
-		else
-				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
-		#else /* CONFIG_DISABLE_MCS13TO15 */
-			set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
-		#endif /* CONFIG_DISABLE_MCS13TO15 */
+		set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
 		break;
 	}
 
@@ -2809,14 +2802,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
 			break;
 		case RF_2T2R:
 		default:
-#ifdef CONFIG_DISABLE_MCS13TO15
-			if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1)
-				set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R_13TO15_OFF);
-			else
-				set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#else /* CONFIG_DISABLE_MCS13TO15 */
 			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#endif /* CONFIG_DISABLE_MCS13TO15 */
 		}
 
 		/* switch to the 40M Hz mode according to the AP */
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 3e211780cde4..2dd902b04509 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1071,14 +1071,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
 		break;
 	case RF_2T2R:
 	default:
-#ifdef CONFIG_DISABLE_MCS13TO15
-		if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1)
-			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R_13TO15_OFF);
-		else
-			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#else /* CONFIG_DISABLE_MCS13TO15 */
 		set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#endif /* CONFIG_DISABLE_MCS13TO15 */
 	}
 
 	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 04/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (2 preceding siblings ...)
  2021-03-16 15:30 ` [PATCH 03/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15 Fabio Aiuto
@ 2021-03-16 15:30 ` Fabio Aiuto
  2021-03-16 15:31 ` [PATCH 05/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_VALIDATE_SSID Fabio Aiuto
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:30 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 2dd902b04509..ea690dbbfebb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1809,15 +1809,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
 
 		preorder_ctrl = &psta->recvreorder_ctrl[tid];
 
-		#ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
-		preorder_ctrl->indicate_seq = start_seq;
-		#ifdef DBG_RX_SEQ
-		DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__,
-			preorder_ctrl->indicate_seq, start_seq);
-		#endif
-		#else
 		preorder_ctrl->indicate_seq = 0xffff;
-		#endif
 
 		preorder_ctrl->enable = pmlmeinfo->accept_addba_req;
 	}
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 05/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_VALIDATE_SSID
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (3 preceding siblings ...)
  2021-03-16 15:30 ` [PATCH 04/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ Fabio Aiuto
@ 2021-03-16 15:31 ` Fabio Aiuto
  2021-03-16 15:31 ` [PATCH 06/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_LAYER2_ROAMING_ACTIVE Fabio Aiuto
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:31 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_VALIDATE_SSID

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index c9418bfb2a00..5929a7bf7db6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -33,17 +33,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
 		goto exit;
 	}
 
-#ifdef CONFIG_VALIDATE_SSID
-	for (i = 0; i < ssid->SsidLength; i++) {
-		/* wifi, printable ascii code must be supported */
-		if (!((ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e))) {
-			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has non-printable ascii\n"));
-			ret = false;
-			break;
-		}
-	}
-#endif /* CONFIG_VALIDATE_SSID */
-
 exit:
 	return ret;
 }
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 06/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_LAYER2_ROAMING_ACTIVE
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (4 preceding siblings ...)
  2021-03-16 15:31 ` [PATCH 05/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_VALIDATE_SSID Fabio Aiuto
@ 2021-03-16 15:31 ` Fabio Aiuto
  2021-03-16 15:32 ` [PATCH 07/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_USB_VENDOR* Fabio Aiuto
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:31 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_LAYER2_ROAMING_ACTIVE

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index a9e5c27a42f7..149093c710ae 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -67,9 +67,6 @@ int	rtw_init_mlme_priv(struct adapter *padapter)
 	pmlmepriv->roam_flags = 0
 		| RTW_ROAM_ON_EXPIRED
 		| RTW_ROAM_ON_RESUME
-		#ifdef CONFIG_LAYER2_ROAMING_ACTIVE /* FIXME */
-		| RTW_ROAM_ACTIVE
-		#endif
 		;
 
 	pmlmepriv->roam_scanr_exp_ms = RTW_ROAM_SCAN_RESULT_EXP_MS;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 07/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_USB_VENDOR*
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (5 preceding siblings ...)
  2021-03-16 15:31 ` [PATCH 06/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_LAYER2_ROAMING_ACTIVE Fabio Aiuto
@ 2021-03-16 15:32 ` Fabio Aiuto
  2021-03-16 15:32 ` [PATCH 08/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SINGLE_RECV_BUF Fabio Aiuto
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:32 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_USB_VENDOR family defines

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/drv_conf.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/drv_conf.h b/drivers/staging/rtl8723bs/include/drv_conf.h
index 7fc88b07a25e..9cef9ce589a1 100644
--- a/drivers/staging/rtl8723bs/include/drv_conf.h
+++ b/drivers/staging/rtl8723bs/include/drv_conf.h
@@ -8,16 +8,6 @@
 #define __DRV_CONF_H__
 #include "autoconf.h"
 
-//About USB VENDOR REQ
-#if defined(CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
-	#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC automatically"
-	#define CONFIG_USB_VENDOR_REQ_MUTEX
-#endif
-#if defined(CONFIG_VENDOR_REQ_RETRY) &&  !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
-	#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_VENDOR_REQ_RETRY automatically"
-	#define CONFIG_USB_VENDOR_REQ_MUTEX
-#endif
-
 #define DYNAMIC_CAMID_ALLOC
 
 #ifndef CONFIG_RTW_HIQ_FILTER
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 08/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SINGLE_RECV_BUF
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (6 preceding siblings ...)
  2021-03-16 15:32 ` [PATCH 07/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_USB_VENDOR* Fabio Aiuto
@ 2021-03-16 15:32 ` Fabio Aiuto
  2021-03-16 15:32 ` [PATCH 09/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_RX_INDICATE_QUEUE Fabio Aiuto
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:32 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_SINGLE_RECV_BUF

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/rtw_recv.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
index 0a56c3a66ee8..acd7a7714740 100644
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -7,13 +7,9 @@
 #ifndef _RTW_RECV_H_
 #define _RTW_RECV_H_
 
-	#ifdef CONFIG_SINGLE_RECV_BUF
-		#define NR_RECVBUFF (1)
-	#else
-		#define NR_RECVBUFF (8)
-	#endif /* CONFIG_SINGLE_RECV_BUF */
+#define NR_RECVBUFF (8)
 
-	#define NR_PREALLOC_RECV_SKB (8)
+#define NR_PREALLOC_RECV_SKB (8)
 
 #define NR_RECVFRAME 256
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 09/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_RX_INDICATE_QUEUE
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (7 preceding siblings ...)
  2021-03-16 15:32 ` [PATCH 08/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SINGLE_RECV_BUF Fabio Aiuto
@ 2021-03-16 15:32 ` Fabio Aiuto
  2021-03-16 15:32 ` [PATCH 10/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_BSD_RX_USE_MBUF Fabio Aiuto
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:32 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_RX_INDICATE_QUEUE

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/rtw_recv.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
index acd7a7714740..3443cb7d0467 100644
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -226,10 +226,6 @@ struct recv_priv {
 	struct tasklet_struct recv_tasklet;
 	struct sk_buff_head free_recv_skb_queue;
 	struct sk_buff_head rx_skb_queue;
-#ifdef CONFIG_RX_INDICATE_QUEUE
-	struct task rx_indicate_tasklet;
-	struct ifqueue rx_indicate_queue;
-#endif	/*  CONFIG_RX_INDICATE_QUEUE */
 
 	u8 *pallocated_recv_buf;
 	u8 *precv_buf;    /*  4 alignment */
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 10/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_BSD_RX_USE_MBUF
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (8 preceding siblings ...)
  2021-03-16 15:32 ` [PATCH 09/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_RX_INDICATE_QUEUE Fabio Aiuto
@ 2021-03-16 15:32 ` Fabio Aiuto
  2021-03-16 15:33 ` [PATCH 11/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_R871X_TEST Fabio Aiuto
  2021-03-16 15:33 ` [PATCH 12/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_MULTI_VIR_IFACES Fabio Aiuto
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:32 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_BSD_RX_USE_MBUF

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/rtw_recv.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
index 3443cb7d0467..b298ec121ee9 100644
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -317,13 +317,8 @@ struct recv_buf {
 */
 struct recv_frame_hdr {
 	struct list_head	list;
-#ifndef CONFIG_BSD_RX_USE_MBUF
 	struct sk_buff	 *pkt;
 	struct sk_buff	 *pkt_newalloc;
-#else /*  CONFIG_BSD_RX_USE_MBUF */
-	struct sk_buff	*pkt;
-	struct sk_buff *pkt_newalloc;
-#endif /*  CONFIG_BSD_RX_USE_MBUF */
 
 	struct adapter  *adapter;
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 11/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_R871X_TEST
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (9 preceding siblings ...)
  2021-03-16 15:32 ` [PATCH 10/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_BSD_RX_USE_MBUF Fabio Aiuto
@ 2021-03-16 15:33 ` Fabio Aiuto
  2021-03-16 15:33 ` [PATCH 12/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_MULTI_VIR_IFACES Fabio Aiuto
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:33 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_R871X_TEST

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/osdep_intf.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h b/drivers/staging/rtl8723bs/include/osdep_intf.h
index aa4337686183..5ad85416c598 100644
--- a/drivers/staging/rtl8723bs/include/osdep_intf.h
+++ b/drivers/staging/rtl8723bs/include/osdep_intf.h
@@ -35,12 +35,6 @@ The protection mechanism is through the pending queue.
 	struct mutex ioctl_mutex;
 };
 
-
-#ifdef CONFIG_R871X_TEST
-int rtw_start_pseudo_adhoc(struct adapter *padapter);
-int rtw_stop_pseudo_adhoc(struct adapter *padapter);
-#endif
-
 struct dvobj_priv *devobj_init(void);
 void devobj_deinit(struct dvobj_priv *pdvobj);
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 12/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_MULTI_VIR_IFACES
  2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
                   ` (10 preceding siblings ...)
  2021-03-16 15:33 ` [PATCH 11/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_R871X_TEST Fabio Aiuto
@ 2021-03-16 15:33 ` Fabio Aiuto
  11 siblings, 0 replies; 13+ messages in thread
From: Fabio Aiuto @ 2021-03-16 15:33 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel

remove conditional code blocks checked by unused
CONFIG_MULTI_VIR_IFACES

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
 drivers/staging/rtl8723bs/include/drv_types.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 9c0e7b6946f8..30bf7fc0994d 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -196,9 +196,6 @@ struct registry_priv {
 	u8 RFE_Type;
 	u8  check_fw_ps;
 
-#ifdef CONFIG_MULTI_VIR_IFACES
-	u8 ext_iface_num;/* primary/secondary iface is excluded */
-#endif
 	u8 qos_opt_enable;
 
 	u8 hiq_filter;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-03-16 15:34 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 15:29 [PATCH 00/12] Remove more unused code blocks Fabio Aiuto
2021-03-16 15:30 ` [PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST Fabio Aiuto
2021-03-16 15:30 ` [PATCH 02/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN* Fabio Aiuto
2021-03-16 15:30 ` [PATCH 03/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15 Fabio Aiuto
2021-03-16 15:30 ` [PATCH 04/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ Fabio Aiuto
2021-03-16 15:31 ` [PATCH 05/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_VALIDATE_SSID Fabio Aiuto
2021-03-16 15:31 ` [PATCH 06/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_LAYER2_ROAMING_ACTIVE Fabio Aiuto
2021-03-16 15:32 ` [PATCH 07/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_USB_VENDOR* Fabio Aiuto
2021-03-16 15:32 ` [PATCH 08/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SINGLE_RECV_BUF Fabio Aiuto
2021-03-16 15:32 ` [PATCH 09/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_RX_INDICATE_QUEUE Fabio Aiuto
2021-03-16 15:32 ` [PATCH 10/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_BSD_RX_USE_MBUF Fabio Aiuto
2021-03-16 15:33 ` [PATCH 11/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_R871X_TEST Fabio Aiuto
2021-03-16 15:33 ` [PATCH 12/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_MULTI_VIR_IFACES Fabio Aiuto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).