FAILED: patch "[PATCH] staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 3bf39f711ff27c64be8680a8938bcc5001982e81
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071347-leotard-finlike-cc76@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3bf39f711ff27c64be8680a8938bcc5001982e81 Mon Sep 17 00:00:00 2001
From: Alexandru Hossu <[email protected]>
Date: Fri, 22 May 2026 02:45:30 +0200
Subject: [PATCH] staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop
The loop in is_ap_in_tkip() iterates over IEs without verifying that enough bytes remain before dereferencing the IE header or its payload:
- pIE->element_id and pIE->length are read without checking that i + sizeof(*pIE) <= ie_length, so a truncated IE at the end of the buffer causes an OOB read.
- For WLAN_EID_VENDOR_SPECIFIC the code compares pIE->data + 12, which requires pIE->length >= 16. For WLAN_EID_RSN it compares pIE->data + 8, requiring pIE->length >= 12. Neither requirement is checked.
Add the missing IE header and payload bounds checks and guard each data access with an explicit pIE->length minimum, matching the pattern established in update_beacon_info().
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +11 -3
@@ -1308,15 +1308,23 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.ie_length;) { pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.ies + i); +if (i +sizeof (*pIE) > pmlmeinfo->network.ie_length) +break ; +if (i +sizeof (*pIE) + pIE->length > pmlmeinfo->network.ie_length) +break ; +switch (pIE->element_id) {case WLAN_EID_VENDOR_SPECIFIC : -if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 ))) +if (pIE->length >=16 && + !memcmp (pIE->data,RTW_WPA_OUI ,4 ) && + !memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 ))return true;break ;case WLAN_EID_RSN : -if (!memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 )) +if (pIE->length >=12 && + !memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 ))return true;break ;
@@ -1324,7 +1332,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)break ; } - i += (pIE->length +2 ); + i +=sizeof (*pIE) + pIE->length; }return false;
Sasha Levin
maintainerPATCH 1/10 staging: rtl8723bs: remove DBG_871X log argument
From: Fabio Aiuto <[email protected]>
[ Upstream commit 42c3243ff23d119331a8ace011e0c18b222a1138 ]
This patch prepares the application of the semantic patch aimed to remove all DBG_871X logs.
One occurrence of the DBG_871X macro has one repeated argument, that's not even comma separated value with the previous one nor a format string parameter associated.
In normal conditions this worked, for the macro is usually not expanded (the do nothing behaviour), but if I try to apply the sempantic patch to remove all macro occurrences, all macros call after that abnormal declaration are left untouched (not removed).
Remove all of the DBG_871X logs as they currently
do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged, so just remove them as they are unused.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -923,7 +923,7 @@ sint ap2sta_data_frame(#ifdef DBG_RX_DROP_FRAME DBG_871X ("DBG_RX_DROP_FRAME %s BSSID =" MAC_FMT ", mybssid =" MAC_FMT "\n" , __func__,MAC_ARG (pattrib->bssid),MAC_ARG (mybssid)); - DBG_871X("this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddystruct adapter->adapter_type); +DBG_871X ("this adapter = %d, buddy adapter = %d\n" , adapter->adapter_type, adapter->pbuddystruct);#endif if (!bmcast) {
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/10 staging: rtl8723bs: remove all DBG_871X logs
From: Fabio Aiuto <[email protected]>
[ Upstream commit 968b15adb0eaf988320da743524652fb3ce3dec4 ]
Remove all of the DBG_871X logs as they
currently do nothing as they require the code to be modified by hand in order to be turned on. This obviously has not happened since the code was merged, so just remove them as they are unused.
applied the following semantic patch script:
@@
expression a, b, c, d, e, f, g, h, i, j, k;
constant B, C, D, E;
@@
(
- DBG_871X(a);
|
- DBG_871X(a, b);
|
- DBG_871X(a, B);
|
- DBG_871X(a, b, c);
|
- DBG_871X(a, B, c);
|
- DBG_871X(a, b, C);
|
- DBG_871X(a, B, C);
|
- DBG_871X(a, b, c, d);
|
- DBG_871X(a, B, c, d);
|
- DBG_871X(a, b, C, d);
|
- DBG_871X(a, b, c, D);
|
- DBG_871X(a, B, C, d);
|
- DBG_871X(a, B, c, D);
|
- DBG_871X(a, b, C, D);
|
- DBG_871X(a, B, C, D);
|
- DBG_871X(a, b, c, d, e);
|
- DBG_871X(a, B, c, d, e);
|
- DBG_871X(a, b, C, d, e);
|
- DBG_871X(a, b, c, D, e);
|
- DBG_871X(a, b, c, d, E);
|
- DBG_871X(a, B, C, d, e);
|
- DBG_871X(a, B, c, D, e);
|
- DBG_871X(a, B, c, d, E);
|
- DBG_871X(a, b, C, D, e);
|
- DBG_871X(a, b, C, d, E);
|
- DBG_871X(a, b, c, D, E);
|
- DBG_871X(a, B, C, D, e);
|
- DBG_871X(a, B, C, d, E);
|
- DBG_871X(a, B, c, D, E);
|
- DBG_871X(a, b, C, D, E);
|
- DBG_871X(a, B, C, D, E);
|
- DBG_871X(a, b, c, d, e, f);
|
- DBG_871X(a, b, c, d, e, f, g);
|
- DBG_871X(a, b, c, d, e, f, g, h);
|
- DBG_871X(a, b, c, d, e, f, g, h, i);
|
- DBG_871X(a, b, c, d, e, f, g, h, i, j);
|
- DBG_871X(a, b, c, d, e, f, g, h, i, j, k);
)
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 141 +-------- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 6 - drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 - drivers/staging/rtl8723bs/core/rtw_efuse.c | 5 - .../staging/rtl8723bs/core/rtw_ieee80211.c | 33 -- drivers/staging/rtl8723bs/core/rtw_io.c | 1 - .../staging/rtl8723bs/core/rtw_ioctl_set.c | 7 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 112 +------ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 210 +------------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 57 +--- drivers/staging/rtl8723bs/core/rtw_recv.c | 105 +------ drivers/staging/rtl8723bs/core/rtw_security.c | 14 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 6 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 56 +--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 47 +-- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 11 - drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 5 - drivers/staging/rtl8723bs/hal/hal_com.c | 39 +-- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 49 +-- drivers/staging/rtl8723bs/hal/hal_intf.c | 12 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 46 +-- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 5 - .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 68 +--- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 9 - .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 - .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 24 -- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 25 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 14 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 138 +-------- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 292 +----------------- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 2 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 59 ---- .../staging/rtl8723bs/os_dep/osdep_service.c | 2 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 1 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 18 -- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 30 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 4 - 37 files changed, 94 insertions(+), 1572 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -138
@@ -181,17 +181,6 @@ u8 chk_sta_is_alive(struct sta_info *psta);u8 chk_sta_is_alive (struct sta_info *psta) {#ifdef DBG_EXPIRATION_CHK -DBG_871X ( -"sta:" MAC_FMT ", rssi:%d, rx:" STA_PKTS_FMT ", expire_to:%u, %s%ssq_len:%u\n" - ,MAC_ARG (psta->hwaddr) - , psta->rssi_stat.UndecoratedSmoothedPWDB -/* STA_RX_PKTS_ARG(psta) */ - ,STA_RX_PKTS_DIFF_ARG (psta) - , psta->expire_to - , psta->state &WIFI_SLEEP_STATE ?"PS, " :"" - , psta->state &WIFI_STA_ALIVE_CHK_STATE ?"SAC, " :"" - , psta->sleepq_len - );#endif sta_update_last_rx_pkts (psta);
@@ -217,9 +206,6 @@ void expire_timeout_chk(struct adapter *padapter)/* check auth_queue */ #ifdef DBG_EXPIRATION_CHK if (phead != plist) { -DBG_871X (FUNC_NDEV_FMT " auth_list, cnt:%u\n" , -FUNC_NDEV_ARG (padapter->pnetdev), - pstapriv->auth_list_cnt); }#endif while (phead != plist) {
@@ -233,16 +219,6 @@ void expire_timeout_chk(struct adapter *padapter)list_del_init (&psta->auth_list); pstapriv->auth_list_cnt--; -DBG_871X ( -"auth expire %02X%02X%02X%02X%02X%02X\n" , - psta->hwaddr[0 ], - psta->hwaddr[1 ], - psta->hwaddr[2 ], - psta->hwaddr[3 ], - psta->hwaddr[4 ], - psta->hwaddr[5 ] - ); -spin_unlock_bh (&pstapriv->auth_list_lock);rtw_free_stainfo (padapter, psta);
@@ -263,8 +239,6 @@ void expire_timeout_chk(struct adapter *padapter)/* check asoc_queue */ #ifdef DBG_EXPIRATION_CHK if (phead != plist) { -DBG_871X (FUNC_NDEV_FMT " asoc_list, cnt:%u\n" - ,FUNC_NDEV_ARG (padapter->pnetdev), pstapriv->asoc_list_cnt); }#endif while (phead != plist) {
@@ -318,11 +292,6 @@ void expire_timeout_chk(struct adapter *padapter) }list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; -DBG_871X ( -"asoc expire " MAC_FMT ", state = 0x%x\n" , -MAC_ARG (psta->hwaddr), - psta->state - ); updated =ap_free_sta (padapter, psta, false,WLAN_REASON_DEAUTH_LEAVING ); }else {/* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */
@@ -331,14 +300,6 @@ void expire_timeout_chk(struct adapter *padapter) NR_XMITFRAME / pstapriv->asoc_list_cnt ) / 2) ) { -DBG_871X ( -"%s sta:" MAC_FMT ", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n" , - __func__, -MAC_ARG (psta->hwaddr), - psta->sleepq_len, - padapter->xmitpriv.free_xmitframe_cnt, - pstapriv->asoc_list_cnt - );wakeup_sta_to_xmit (padapter, psta); } }
@@ -371,26 +332,15 @@ void expire_timeout_chk(struct adapter *padapter) psta->keep_alive_trycnt++;if (ret == _SUCCESS) { -DBG_871X ( -"asoc check, sta(" MAC_FMT ") is alive\n" , -MAC_ARG (psta->hwaddr) - ); psta->expire_to = pstapriv->expire_to; psta->keep_alive_trycnt =0 ;continue ; }else if (psta->keep_alive_trycnt <=3 ) { -DBG_871X ( -"ack check for asoc expire, keep_alive_trycnt =%d\n" , - psta->keep_alive_trycnt); psta->expire_to =1 ;continue ; } psta->keep_alive_trycnt =0 ; -DBG_871X ( -"asoc expire " MAC_FMT ", state = 0x%x\n" , -MAC_ARG (psta->hwaddr), - psta->state);spin_lock_bh (&pstapriv->asoc_list_lock);if (list_empty (&psta->asoc_list) == false) {list_del_init (&psta->asoc_list);
@@ -454,12 +404,8 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) arg[2 ] = shortGIrate; arg[3 ] = psta->init_rate; -DBG_871X ("%s => mac_id:%d , raid:%d , shortGIrate =%d, bitmap = 0x%x\n" , - __func__, psta->mac_id, psta->raid, shortGIrate, tx_ra_bitmap); -rtw_hal_add_ra_tid (padapter, tx_ra_bitmap, arg, rssi_level); }else { -DBG_871X ("station aid %d exceed the max number\n" , psta->aid); } }
@@ -527,9 +473,6 @@ void update_bmc_sta(struct adapter *padapter) arg[2 ] =0 ; arg[3 ] = psta->init_rate; -DBG_871X ("%s => mac_id:%d , raid:%d , bitmap = 0x%x\n" , - __func__, psta->mac_id, psta->raid, tx_ra_bitmap); -rtw_hal_add_ra_tid (padapter, tx_ra_bitmap, arg,0 ); }
@@ -540,7 +483,6 @@ void update_bmc_sta(struct adapter *padapter)spin_unlock_bh (&psta->lock); }else { -DBG_871X ("add_RATid_bmc_sta error!\n" ); } }
@@ -625,14 +567,12 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)if (TEST_FLAG (phtpriv_ap->ldpc_cap,LDPC_HT_ENABLE_TX ) &&GET_HT_CAPABILITY_ELE_LDPC_CAP ((u8 *)(&phtpriv_sta->ht_cap))) {SET_FLAG (cur_ldpc_cap, (LDPC_HT_ENABLE_TX |LDPC_HT_CAP_TX )); -DBG_871X ("Enable HT Tx LDPC for STA(%d)\n" , psta->aid); }/* B7 B8 B9 Config STBC setting */ if (TEST_FLAG (phtpriv_ap->stbc_cap,STBC_HT_ENABLE_TX ) &&GET_HT_CAPABILITY_ELE_RX_STBC ((u8 *)(&phtpriv_sta->ht_cap))) {SET_FLAG (cur_stbc_cap, (STBC_HT_ENABLE_TX |STBC_HT_CAP_TX )); -DBG_871X ("Enable HT Tx STBC for STA(%d)\n" , psta->aid); } }else { phtpriv_sta->ampdu_enable = false;
@@ -747,7 +687,7 @@ static void update_hw_ht_param(struct adapter *padapter) pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ) & 0x0C) >> 2;if (pmlmeinfo->SM_PS ==WLAN_HT_CAP_SM_PS_STATIC ) -DBG_871X ("%s(): WLAN_HT_CAP_SM_PS_STATIC\n" , __func__); + {}/* */ /* Config current HT Protection mode. */
@@ -896,12 +836,6 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf) }set_channel_bwmode (padapter, cur_channel, cur_ch_offset, cur_bwmode); -DBG_871X ( -"CH =%d, BW =%d, offset =%d\n" , - cur_channel, - cur_bwmode, - cur_ch_offset - ); pmlmeext->cur_channel = cur_channel; pmlmeext->cur_bwmode = cur_bwmode; pmlmeext->cur_ch_offset = cur_ch_offset;
@@ -929,7 +863,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)#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" ); + {}#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ }
@@ -961,19 +895,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;u8 *ie = pbss_network->IEs; -/* SSID */ -/* Supported rates */ -/* DS Params */ -/* WLAN_EID_COUNTRY */ -/* ERP Information element */ -/* Extended supported rates */ -/* WPA/WPA2 */ -/* Wi-Fi Wireless Multimedia Extensions */ -/* ht_capab, ht_oper */ -/* WPS IE */ - -DBG_871X ("%s, len =%d\n" , __func__, len); -if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return _FAIL;
@@ -1320,8 +1241,6 @@ void rtw_set_macaddr_acl(struct adapter *padapter, int mode)struct sta_priv *pstapriv = &padapter->stapriv;struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -DBG_871X ("%s, mode =%d\n" , __func__, mode); - pacl_list->mode = mode; }
@@ -1335,13 +1254,6 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;struct __queue *pacl_node_q = &pacl_list->acl_node_q; -DBG_871X ( -"%s(acl_num =%d) =" MAC_FMT "\n" , - __func__, - pacl_list->num, -MAC_ARG (addr) - ); -if ((NUM_ACL -1 ) < pacl_list->num)return (-1 );
@@ -1357,7 +1269,6 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)if (!memcmp (paclnode->addr, addr,ETH_ALEN )) {if (paclnode->valid == true) { added = true; -DBG_871X ("%s, sta has been added\n" , __func__);break ; } }
@@ -1388,8 +1299,6 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) } } -DBG_871X ("%s, acl_num =%d\n" , __func__, pacl_list->num); -spin_unlock_bh (&(pacl_node_q->lock));return ret;
@@ -1404,13 +1313,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)struct __queue *pacl_node_q = &pacl_list->acl_node_q;u8 baddr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };/* Baddr is used for clearing acl_list */ -DBG_871X ( -"%s(acl_num =%d) =" MAC_FMT "\n" , - __func__, - pacl_list->num, -MAC_ARG (addr) - ); -spin_lock_bh (&(pacl_node_q->lock)); phead =get_list_head (pacl_node_q);
@@ -1436,8 +1338,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)spin_unlock_bh (&(pacl_node_q->lock)); -DBG_871X ("%s, acl_num =%d\n" , __func__, pacl_list->num); - }u8 rtw_ap_set_pairwise_key (struct adapter *padapter,struct sta_info *psta)
@@ -1589,8 +1489,6 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)unsigned char *p, *ie = pnetwork->IEs;u32 len =0 ; -DBG_871X ("%s, ERP_enable =%d\n" , __func__, pmlmeinfo->ERP_enable); -if (!pmlmeinfo->ERP_enable)return ;
@@ -1744,7 +1642,7 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui)update_bcn_p2p_ie (padapter); else - DBG_871X("unknown OUI type!\n"); + {} }void update_beacon (struct adapter *padapter,u8 ie_id,u8 *oui,u8 tx)
@@ -1851,9 +1749,6 @@ static int rtw_ht_operation_update(struct adapter *padapter)/* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */ /* return 0; */ -DBG_871X ("%s current operation mode = 0x%X\n" , - __func__, pmlmepriv->ht_op_mode); -if (!(pmlmepriv->ht_op_mode &HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ) && pmlmepriv->num_sta_ht_no_gf) { pmlmepriv->ht_op_mode |=
@@ -1903,9 +1798,6 @@ static int rtw_ht_operation_update(struct adapter *padapter) op_mode_changes++; } -DBG_871X ("%s new operation mode = 0x%X changes =%d\n" , - __func__, pmlmepriv->ht_op_mode, op_mode_changes); -return op_mode_changes; }
@@ -2021,9 +1913,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)if (psta->flags &WLAN_STA_HT ) {u16 ht_capab =le16_to_cpu (psta->htpriv.ht_cap.cap_info); -DBG_871X ("HT: STA " MAC_FMT " HT Capabilities " -"Info: 0x%04x\n" ,MAC_ARG (psta->hwaddr), ht_capab); -if (psta->no_ht_set) { psta->no_ht_set =0 ; pmlmepriv->num_sta_no_ht--;
@@ -2034,10 +1923,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->no_ht_gf_set =1 ; pmlmepriv->num_sta_ht_no_gf++; } -DBG_871X ("%s STA " MAC_FMT " - no " -"greenfield, num of non-gf stations %d\n" , - __func__,MAC_ARG (psta->hwaddr), - pmlmepriv->num_sta_ht_no_gf); }if ((ht_capab &IEEE80211_HT_CAP_SUP_WIDTH ) ==0 ) {
@@ -2045,10 +1930,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->ht_20mhz_set =1 ; pmlmepriv->num_sta_ht_20mhz++; } -DBG_871X ("%s STA " MAC_FMT " - 20 MHz HT, " -"num of 20MHz HT STAs %d\n" , - __func__,MAC_ARG (psta->hwaddr), - pmlmepriv->num_sta_ht_20mhz); } }else {
@@ -2057,10 +1938,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_no_ht++; }if (pmlmepriv->htpriv.ht_option == true) { -DBG_871X ("%s STA " MAC_FMT -" - no HT, num of non-HT stations %d\n" , - __func__,MAC_ARG (psta->hwaddr), - pmlmepriv->num_sta_no_ht); } }
@@ -2071,8 +1948,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)/* update associated stations cap. */ associated_clients_update (padapter, beacon_updated); - -DBG_871X ("%s, updated =%d\n" , __func__, beacon_updated); }u8 bss_cap_update_on_sta_leave (struct adapter *padapter,struct sta_info *psta)
@@ -2133,11 +2008,6 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); } -/* update associated stations cap. */ -/* associated_clients_update(padapter, beacon_updated); //move it to avoid deadlock */ - -DBG_871X ("%s, updated =%d\n" , __func__, beacon_updated); -return beacon_updated; }
@@ -2195,8 +2065,6 @@ void rtw_sta_flush(struct adapter *padapter)struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -DBG_871X (FUNC_NDEV_FMT "\n" ,FUNC_NDEV_ARG (padapter->pnetdev)); -if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )return ;
@@ -2324,7 +2192,6 @@ void rtw_ap_restore_network(struct adapter *padapter) psta =rtw_get_stainfo_by_offset (pstapriv, chk_alive_list[i]);if (psta ==NULL ) { -DBG_871X (FUNC_ADPT_FMT " sta_info is null\n" ,FUNC_ADPT_ARG (padapter)); }else if (psta->state & _FW_LINKED) {rtw_sta_media_status_rpt (padapter, psta,1 );Update_RA_Entry (padapter, psta);
@@ -2428,8 +2295,6 @@ void stop_ap_mode(struct adapter *padapter) }spin_unlock_bh (&(pacl_node_q->lock)); -DBG_871X ("%s, free acl_node_queue, num =%d\n" , __func__, pacl_list->num); -rtw_sta_flush (padapter);/* free_assoc_sta_resources */
drivers/staging/rtl8723bs/core/rtw_btcoex.c +0 -6
@@ -22,16 +22,10 @@ void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)void rtw_btcoex_HaltNotify (struct adapter *padapter) {if (!padapter->bup) { -DBG_871X (FUNC_ADPT_FMT ": bup =%d Skip!\n" , -FUNC_ADPT_ARG (padapter), padapter->bup); -return ; }if (padapter->bSurpriseRemoved) { -DBG_871X (FUNC_ADPT_FMT ": bSurpriseRemoved =%d Skip!\n" , -FUNC_ADPT_ARG (padapter), padapter->bSurpriseRemoved); -return ; }
drivers/staging/rtl8723bs/core/rtw_cmd.c +0 -12
@@ -501,9 +501,6 @@ int rtw_cmd_thread(void *context) cmd_process_time =jiffies_to_msecs (jiffies - cmd_start_time);if (cmd_process_time >1000 ) { -DBG_871X (ADPT_FMT "cmd= %d process_time= %lu > 1 sec\n" , -ADPT_ARG (pcmd->padapter), pcmd->cmdcode, - cmd_process_time); }/* call callback function for post-processed */
@@ -597,9 +594,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,if (ssid[i].SsidLength) {memcpy (&psurveyPara->ssid[i], &ssid[i],sizeof (struct ndis_802_11_ssid )); psurveyPara->ssid_num++; - -DBG_871X (FUNC_ADPT_FMT " ssid:(%s, %d)\n" ,FUNC_ADPT_ARG (padapter), - psurveyPara->ssid[i].Ssid, psurveyPara->ssid[i].SsidLength); } } }
@@ -611,9 +605,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,if (ch[i].hw_value && !(ch[i].flags &RTW_IEEE80211_CHAN_DISABLED )) {memcpy (&psurveyPara->ch[i], &ch[i],sizeof (struct rtw_ieee80211_channel )); psurveyPara->ch_num++; - -DBG_871X (FUNC_ADPT_FMT " ch:%u\n" ,FUNC_ADPT_ARG (padapter), - psurveyPara->ch[i].hw_value); } } }
@@ -1583,9 +1574,6 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)mutex_lock (&pwrpriv->lock);if (pwrpriv->dtim != dtim) { -DBG_871X ("change DTIM from %d to %d, bFwCurrentInPSMode =%d, ps_mode =%d\n" , pwrpriv->dtim, dtim, - pwrpriv->bFwCurrentInPSMode, pwrpriv->pwr_mode); - pwrpriv->dtim = dtim; }
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -5
@@ -295,8 +295,6 @@ bool bPseudoTest) }else { *data =0xff ; bResult = false; -DBG_871X ("%s: [ERROR] addr = 0x%x bResult =%d time out 1s !!!\n" , __func__, addr, bResult); -DBG_871X ("%s: [ERROR] EFUSE_CTRL = 0x%08x !!!\n" , __func__,rtw_read32 (padapter,EFUSE_CTRL )); }return bResult;
@@ -349,9 +347,6 @@ bool bPseudoTest) bResult = true; }else { bResult = false; -DBG_871X ("%s: [ERROR] addr = 0x%x , efuseValue = 0x%x , bResult =%d time out 1s !!!\n" , - __func__, addr, efuseValue, bResult); -DBG_871X ("%s: [ERROR] EFUSE_CTRL = 0x%08x !!!\n" , __func__,rtw_read32 (padapter,EFUSE_CTRL )); }/* disable Efuse program enable */
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +0 -33
@@ -872,9 +872,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,* sub-type. */ if (elen <4 ) {if (show_errors) { -DBG_871X ("short vendor specific " -"information element ignored (len =%lu)\n" , - (unsigned long ) elen); }return -1 ; }
@@ -893,10 +890,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,break ;case WME_OUI_TYPE :/* this is a Wi-Fi WME info. element */ if (elen <5 ) { -DBG_871X ("short WME " -"information element ignored " -"(len =%lu)\n" , - (unsigned long ) elen);return -1 ; }switch (pos[4 ]) {
@@ -910,10 +903,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen, elems->wme_tspec_len = elen;break ;default : -DBG_871X ("unknown WME " -"information element ignored " -"(subtype =%d len =%lu)\n" , - pos[4 ], (unsigned long ) elen);return -1 ; }break ;
@@ -923,10 +912,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen, elems->wps_ie_len = elen;break ;default : -DBG_871X ("Unknown Microsoft " -"information element ignored " -"(type =%d len =%lu)\n" , - pos[3 ], (unsigned long ) elen);return -1 ; }break ;
@@ -938,19 +923,11 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen, elems->vendor_ht_cap_len = elen;break ;default : -DBG_871X ("Unknown Broadcom " -"information element ignored " -"(type =%d len =%lu)\n" , - pos[3 ], (unsigned long ) elen);return -1 ; }break ;default : -DBG_871X ("unknown vendor specific information " -"element ignored (vendor OUI %02x:%02x:%02x " -"len =%lu)\n" , - pos[0 ], pos[1 ], pos[2 ], (unsigned long ) elen);return -1 ; }
@@ -984,10 +961,6 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,if (elen > left) {if (show_errors) { -DBG_871X ("IEEE 802.11 element " -"parse failed (id =%d elen =%d " -"left =%lu)\n" , - id, elen, (unsigned long ) left); }return ParseFailed; }
@@ -1087,9 +1060,6 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, unknown++;if (!show_errors)break ; -DBG_871X ("IEEE 802.11 element parse " -"ignored unknown element (id =%d elen =%d)\n" , - id, elen);break ; }
@@ -1127,11 +1097,8 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr)ether_addr_copy (mac_addr, addr); }else {eth_random_addr (mac_addr); -DBG_871X ("MAC Address from efuse error, assign random one !!!\n" ); } } - -DBG_871X ("rtw_macaddr_cfg MAC Address = " MAC_FMT "\n" ,MAC_ARG (mac_addr)); }static int rtw_get_cipher_info (struct wlan_network *pnetwork)
drivers/staging/rtl8723bs/core/rtw_io.c +0 -1
@@ -173,7 +173,6 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)int ret = false;int value =atomic_inc_return (&dvobj->continual_io_error);if (value >MAX_CONTINUAL_IO_ERR ) { -DBG_871X ("[dvobj:%p][ERROR] continual_io_error:%d > %d\n" , dvobj, value,MAX_CONTINUAL_IO_ERR ); ret = true; }else {/* DBG_871X("[dvobj:%p] continual_io_error:%d\n", dvobj, value); */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -6
@@ -174,7 +174,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)spin_lock_bh (&pmlmepriv->lock); -DBG_871X ("Set BSSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv));if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) { goto handle_tkip_countermeasure; }else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) {
@@ -251,7 +250,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)spin_lock_bh (&pmlmepriv->lock); -DBG_871X ("Set SSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv));if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) { goto handle_tkip_countermeasure; }else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) {
@@ -351,8 +349,6 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1 bssid_valid = false;if (!ssid_valid && !bssid_valid) { -DBG_871X (FUNC_ADPT_FMT " ssid:%p, ssid_valid:%d, bssid:%p, bssid_valid:%d\n" , -FUNC_ADPT_ARG (padapter), ssid, ssid_valid, bssid, bssid_valid); status = _FAIL; goto exit; }
@@ -493,7 +489,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)/* modify for CONFIG_IEEE80211W, none 11w can use it */ rtw_free_assoc_resources_cmd (padapter);if (_FAIL ==rtw_pwr_wakeup (padapter)) -DBG_871X ("%s(): rtw_pwr_wakeup fail !!!\n" , __func__); + {} }spin_unlock_bh (&pmlmepriv->lock);
@@ -531,7 +527,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s } }else {if (rtw_is_scan_deny (padapter)) { -DBG_871X (FUNC_ADPT_FMT ": scan deny\n" ,FUNC_ADPT_ARG (padapter));indicate_wx_scan_complete_event (padapter);return _SUCCESS; }
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -106
370 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +10 -200
773 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +6 -51
253 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +3 -102
431 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_security.c +2 -12
@@ -1776,11 +1776,6 @@ static sint aes_decipher(u8 *key, uint hdrlen, i, pframe[hdrlen +8 + plen -8 + i], message[hdrlen + 8 + plen - 8 + i])); -DBG_871X ("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n" , - __func__, - i, - pframe[hdrlen +8 + plen -8 + i], - message[hdrlen +8 + plen -8 + i]); res = _FAIL; } }
@@ -1853,8 +1848,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) { -DBG_871X ("not match packet_index =%d, install_index =%d\n" - , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid); res = _FAIL; goto exit; }
@@ -1895,7 +1888,6 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)BIP_AAD =rtw_zmalloc (ori_len);if (BIP_AAD ==NULL ) { -DBG_871X ("BIP AAD allocate fail\n" );return _FAIL; }/* PKT start */
@@ -1915,14 +1907,12 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe) temp_ipn =le64_to_cpu (le_tmp64);/* BIP packet number should bigger than previous BIP packet */ if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx) { -DBG_871X ("replay BIP packet\n" ); goto BIP_exit; }/* copy key index */ memcpy (&le_tmp, p+2 ,2 ); keyid =le16_to_cpu (le_tmp);if (keyid != padapter->securitypriv.dot11wBIPKeyid) { -DBG_871X ("BIP key index error!\n" ); goto BIP_exit; }/* clear the MIC field of MME to zero */
@@ -1944,8 +1934,8 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)if (!memcmp (mic, pframe+pattrib->pkt_len-8 ,8 )) { pmlmeext->mgnt_80211w_IPN_rx = temp_ipn; res = _SUCCESS; - }else -DBG_871X ("BIP MIC error!\n" ); + }else { + } }else res =RTW_RX_HANDLED ;
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +2 -4
@@ -107,7 +107,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof (struct sta_info );if (!stainfo_offset_valid (offset)) -DBG_871X ("%s invalid offset(%d), out of range!!!" , __func__, offset); + {}return offset; }
@@ -115,7 +115,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)inline struct sta_info *rtw_get_stainfo_by_offset (struct sta_priv *stapriv,int offset) {if (!stainfo_offset_valid (offset)) -DBG_871X ("%s invalid offset(%d), out of range!!!" , __func__, offset); + {}return (struct sta_info *)(stapriv->pstainfo_buf + offset *sizeof (struct sta_info )); }
@@ -271,8 +271,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) preorder_ctrl->indicate_seq =0xffff ;#ifdef DBG_RX_SEQ -DBG_871X ("DBG_RX_SEQ %s:%d IndicateSeq: %d\n" , __func__, __LINE__, - preorder_ctrl->indicate_seq);#endif preorder_ctrl->wend_b =0xffff ;/* preorder_ctrl->wsize_b = (NR_RECVBUFF-2); */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -53
238 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_xmit.c +6 -41
259 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -11
@@ -1844,11 +1844,6 @@ void PHY_IQCalibrate_8723B( offset = pRFCalibrateInfo->TxIQC_8723B[path][i][0 ]; data = pRFCalibrateInfo->TxIQC_8723B[path][i][1 ];if ((offset ==0 ) || (data ==0 )) { -DBG_871X ( -"%s =>path:%s Restore TX IQK result failed\n" , - __func__, - (path ==ODM_RF_PATH_A )?"A" :"B" - ); bResult =FAIL ;break ; }
@@ -1861,11 +1856,6 @@ void PHY_IQCalibrate_8723B( offset = pRFCalibrateInfo->RxIQC_8723B[path][i][0 ]; data = pRFCalibrateInfo->RxIQC_8723B[path][i][1 ];if ((offset ==0 ) || (data ==0 )) { -DBG_871X ( -"%s =>path:%s Restore RX IQK result failed\n" , - __func__, - (path ==ODM_RF_PATH_A )?"A" :"B" - ); bResult =FAIL ;break ; }
@@ -1874,7 +1864,6 @@ void PHY_IQCalibrate_8723B( }if (pDM_Odm->RFCalibrateInfo.TxLOK[ODM_RF_PATH_A ] ==0 ) { -DBG_871X ("%s => Restore Path-A TxLOK result failed\n" , __func__); bResult =FAIL ; }else {PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_TXM_IDAC , bRFRegOffsetMask, pDM_Odm->RFCalibrateInfo.TxLOK[ODM_RF_PATH_A ]);
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c +0 -5
@@ -148,11 +148,6 @@ u8 HalPwrSeqCmdParsing(udelay (10 );if (pollingCount++ > maxPollingCnt) { -DBG_871X ( -"Fail to polling Offset[%#x]=%02x\n" , - offset, - value - );return false; }
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/hal_com.c +2 -37
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +10 -39
49 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/hal_intf.c +4 -8
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +3 -43
46 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +0 -5
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -65
68 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -9
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -24
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -24
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/hal/sdio_ops.c +2 -12
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +8 -130
138 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +10 -282
292 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +0 -2
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -59
59 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/osdep_service.c +0 -2
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +0 -18
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +9 -21
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +0 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.53.0
Part of the diff is not shown here. View the raw message.
Sasha Levin
maintainerPATCH 3/10 staging: rtl8723bs: remove commented out DBG_871X logs
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit 68e79909e1d84251ae1889cbad45672f5ba85d7e ]
remove all commented out DBG_871X logs unmatched by semantic patch.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 - drivers/staging/rtl8723bs/core/rtw_cmd.c | 24 ------ drivers/staging/rtl8723bs/core/rtw_efuse.c | 6 -- .../staging/rtl8723bs/core/rtw_ieee80211.c | 1 - drivers/staging/rtl8723bs/core/rtw_io.c | 1 - .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 - drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 -- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 36 --------- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 23 ------ drivers/staging/rtl8723bs/core/rtw_recv.c | 22 ------ .../staging/rtl8723bs/core/rtw_wlan_util.c | 5 -- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 - drivers/staging/rtl8723bs/hal/hal_com.c | 1 - .../staging/rtl8723bs/hal/hal_com_phycfg.c | 78 ------------------- drivers/staging/rtl8723bs/hal/odm.c | 3 - drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 30 ------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 13 ---- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 5 -- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 - .../staging/rtl8723bs/include/rtw_pwrctrl.h | 1 - .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 +-- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 34 -------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 - drivers/staging/rtl8723bs/os_dep/recv_linux.c | 1 - .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 13 ---- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 3 - 26 files changed, 2 insertions(+), 324 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +0 -2
@@ -271,8 +271,6 @@ void expire_timeout_chk(struct adapter *padapter) psta->expire_to = pstapriv->expire_to; psta->state |=WIFI_STA_ALIVE_CHK_STATE ; -/* DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); */ -/* to update bcn with tim_bitmap for this station */ pstapriv->tim_bitmap |=BIT (psta->aid);update_beacon (padapter, _TIM_IE_,NULL , true);
drivers/staging/rtl8723bs/core/rtw_cmd.c +0 -24
@@ -317,12 +317,6 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)if ((pcmdpriv->padapter->hw_init_completed == false && bAllow == false) ||atomic_read (&(pcmdpriv->cmdthd_running)) == false/* com_thread not running */ ) { -/* DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__, */ -/* cmd_obj->cmdcode, */ -/* pcmdpriv->padapter->hw_init_completed, */ -/* pcmdpriv->cmdthd_running */ -/* */ -return _FAIL; }return _SUCCESS;
@@ -433,7 +427,6 @@ int rtw_cmd_thread(void *context) }if (list_empty (&(pcmdpriv->cmd_queue.queue))) { -/* DBG_871X("%s: cmd queue is empty!\n", __func__); */ continue ; }
@@ -532,8 +525,6 @@ int rtw_cmd_thread(void *context)break ; } -/* DBG_871X("%s: leaving... drop cmdcode:%u size:%d\n", __func__, pcmd->cmdcode, pcmd->cmdsz); */ -if (pcmd->cmdcode ==GEN_CMD_CODE (_Set_Drv_Extra)) { extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf;if (extra_parm->pbuf && extra_parm->size >0 ) {
@@ -1084,8 +1075,6 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)init_h2fwcmd_w_parm_no_rsp (ph2c, paddbareq_parm,GEN_CMD_CODE (_AddBAReq)); -/* DBG_871X("rtw_addbareq_cmd, tid =%d\n", tid); */ -/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ res =rtw_enqueue_cmd (pcmdpriv, ph2c);
@@ -1325,7 +1314,6 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)/* check traffic for powersaving. */ if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) >8 ) || (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2 )) { -/* DBG_871X("(-)Tx = %d, Rx = %d\n", pmlmepriv->LinkDetectInfo.NumTxOkInPeriod, pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */ bEnterPS = false;if (bBusyTraffic == true) {
@@ -1334,15 +1322,11 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) pmlmepriv->LinkDetectInfo.TrafficTransitionCount++; -/* DBG_871X("Set TrafficTransitionCount to %d\n", pmlmepriv->LinkDetectInfo.TrafficTransitionCount); */ -if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >30 /*TrafficTransitionLevel*/ ) { pmlmepriv->LinkDetectInfo.TrafficTransitionCount =30 ; } } }else { -/* DBG_871X("(+)Tx = %d, Rx = %d\n", pmlmepriv->LinkDetectInfo.NumTxOkInPeriod, pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */ -if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >=2 ) pmlmepriv->LinkDetectInfo.TrafficTransitionCount -=2 ;else
@@ -1435,7 +1419,6 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)switch (lps_ctrl_type) {case LPS_CTRL_SCAN : -/* DBG_871X("LPS_CTRL_SCAN\n"); */ hal_btcoex_ScanNotify (padapter, true);if (check_fwstate (pmlmepriv, _FW_LINKED) == true) {
@@ -1444,11 +1427,9 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) }break ;case LPS_CTRL_JOINBSS : -/* DBG_871X("LPS_CTRL_JOINBSS\n"); */ LPS_Leave (padapter,"LPS_CTRL_JOINBSS" );break ;case LPS_CTRL_CONNECT : -/* DBG_871X("LPS_CTRL_CONNECT\n"); */ mstatus =1 ;/* connect */ /* Reset LPS Setting */ pwrpriv->LpsIdleCount =0 ;
@@ -1456,20 +1437,17 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)rtw_btcoex_MediaStatusNotify (padapter, mstatus);break ;case LPS_CTRL_DISCONNECT : -/* DBG_871X("LPS_CTRL_DISCONNECT\n"); */ mstatus =0 ;/* disconnect */ rtw_btcoex_MediaStatusNotify (padapter, mstatus);LPS_Leave (padapter,"LPS_CTRL_DISCONNECT" );rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus));break ;case LPS_CTRL_SPECIAL_PACKET : -/* DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); */ pwrpriv->DelayLPSLastTimeStamp = jiffies;hal_btcoex_SpecialPacketNotify (padapter,PACKET_DHCP );LPS_Leave (padapter,"LPS_CTRL_SPECIAL_PACKET" );break ;case LPS_CTRL_LEAVE : -/* DBG_871X("LPS_CTRL_LEAVE\n"); */ LPS_Leave (padapter,"LPS_CTRL_LEAVE" );break ;case LPS_CTRL_TRAFFIC_BUSY :
@@ -1580,8 +1558,6 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) {u8 ps_mode = pwrpriv->pwr_mode; -/* DBG_871X("change DTIM from %d to %d, ps_mode =%d\n", pwrpriv->dtim, dtim, ps_mode); */ -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); }
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -6
@@ -262,9 +262,6 @@ bool bPseudoTest)u8 bResult;u8 readbyte; -/* DBG_871X("===> EFUSE_OneByteRead(), addr = %x\n", addr); */ -/* DBG_871X("===> EFUSE_OneByteRead() start, 0x34 = 0x%X\n", rtw_read32(padapter, EFUSE_TEST)); */ -if (bPseudoTest) {return Efuse_Read1ByteFromFakeContent (padapter, addr, data); }
@@ -312,9 +309,6 @@ bool bPseudoTest)u8 bResult = false;u32 efuseValue =0 ; -/* DBG_871X("===> EFUSE_OneByteWrite(), addr = %x data =%x\n", addr, data); */ -/* DBG_871X("===> EFUSE_OneByteWrite() start, 0x34 = 0x%X\n", rtw_read32(padapter, EFUSE_TEST)); */ -if (bPseudoTest) {return Efuse_Write1ByteToFakeContent (padapter, addr, data); }
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +0 -1
@@ -809,7 +809,6 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_attu16 attr_data_len =get_unaligned_be16 (attr_ptr +2 );u16 attr_len = attr_data_len +4 ; -/* DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); */ if (attr_id == target_attr_id) { target_attr_ptr = attr_ptr;
drivers/staging/rtl8723bs/core/rtw_io.c +0 -1
@@ -175,7 +175,6 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)if (value >MAX_CONTINUAL_IO_ERR ) { ret = true; }else { -/* DBG_871X("[dvobj:%p] continual_io_error:%d\n", dvobj, value); */ }return ret; }
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +0 -2
@@ -137,7 +137,6 @@ u8 rtw_do_join(struct adapter *padapter)if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false ||rtw_to_roam (padapter) >0 ) { -/* DBG_871X("rtw_do_join() when no desired bss in scanning queue\n"); */ ret =rtw_sitesurvey_cmd (padapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 );if (_SUCCESS != ret) { pmlmepriv->to_join = false;
@@ -415,7 +414,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if (*pold_state != networktype) {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, (" change mode!" )); -/* DBG_871X("change mode, old_mode =%d, new_mode =%d, fw_state = 0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); */ if (*pold_state == Ndis802_11APMode) {/* change to other mode from Ndis802_11APMode */
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -7
@@ -208,8 +208,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor pmlmepriv->num_of_scanned--; -/* DBG_871X("_rtw_free_network:SSID =%s\n", pnetwork->network.Ssid.Ssid); */ -spin_unlock_bh (&free_queue->lock); }
@@ -895,8 +893,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } } -/* DBG_871X("scan complete in %dms\n", jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time)); */ -spin_unlock_bh (&pmlmepriv->lock);rtw_os_xmit_schedule (adapter);
@@ -1047,8 +1043,6 @@ void rtw_indicate_disconnect(struct adapter *padapter)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS ); -/* DBG_871X("clear wps when %s\n", __func__); */ -if (rtw_to_roam (padapter) >0 )_clr_fwstate_ (pmlmepriv, _FW_LINKED);
@@ -2684,7 +2678,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR ); max_ampdu_sz =1 << (max_ampdu_sz+3 );/* max_ampdu_sz (kbytes); */ -/* DBG_871X("rtw_update_ht_cap(): max_ampdu_sz =%d\n", max_ampdu_sz); */ phtpriv->rx_ampdu_maxlen = max_ampdu_sz; }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -36
@@ -612,9 +612,6 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; } - -/* DBG_871X("+OnProbeReq\n"); */ -#ifdef CONFIG_AUTO_AP_MODE if (check_fwstate (pmlmepriv, _FW_LINKED) && pmlmepriv->cur_network.join_res) {
@@ -741,7 +738,6 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) _issue_probersp:if ((check_fwstate (pmlmepriv, _FW_LINKED) && pmlmepriv->cur_network.join_res) ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { -/* DBG_871X("+issue_probersp during ap mode\n"); */ issue_probersp (padapter,get_sa (pframe), is_valid_p2p_probereq); }
@@ -836,7 +832,6 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)/* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon received */ if ((sta_rx_pkts (psta) &0xf ) ==0 ) -/* DBG_871X("update_bcn_info\n"); */ update_beacon_info (padapter, pframe, len, psta);adaptive_early_32k (pmlmeext, pframe, len);
@@ -847,7 +842,6 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)/* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon received */ if ((sta_rx_pkts (psta) &0xf ) ==0 ) { -/* DBG_871X("update_bcn_info\n"); */ update_beacon_info (padapter, pframe, len, psta); } }else {
@@ -1104,7 +1098,6 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);if (p ==NULL ) { -/* DBG_871X("marc: no challenge text?\n"); */ goto authclnt_fail; }
@@ -1126,7 +1119,6 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram } }else {/* this is also illegal */ -/* DBG_871X("marc: clnt auth failed due to illegal seq =%x\n", seq); */ goto authclnt_fail; }
@@ -1924,7 +1916,6 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra psta->state ^=WIFI_STA_ALIVE_CHK_STATE ; } -/* DBG_871X("marc: ADDBA RSP: %x\n", pmlmeinfo->agg_enable_bitmap); */ break ;case RTW_WLAN_ACTION_DELBA :/* DELBA */
@@ -2151,8 +2142,6 @@ unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame)unsigned int DoReserved (struct adapter *padapter,union recv_frame *precv_frame) { - -/* DBG_871X("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); */ return _SUCCESS; }
@@ -2203,7 +2192,6 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate)struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); pmlmeext->tx_rate = rate; -/* DBG_871X("%s(): rate = %x\n", __func__, rate); */ }void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib)
@@ -2334,8 +2322,6 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) ssid_ie =rtw_get_ie (ies,WLAN_EID_SSID , &ssid_len_ori, ies_len); -/* DBG_871X("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __func__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */ -if (ssid_ie && ssid_len_ori >0 ) {switch (hidden_ssid_mode) {case 1 :
@@ -2412,7 +2398,6 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr );if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { -/* DBG_871X("ie len =%d\n", cur_network->IELength); */ {int len_diff;
@@ -2510,7 +2495,6 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pattrib->last_txcmdsz = pattrib->pktlen; -/* DBG_871X("issue bcn_sz =%d\n", pattrib->last_txcmdsz); */ if (timeout_ms >0 )dump_mgntframe_and_wait (padapter, pmgntframe, timeout_ms);else
@@ -2964,13 +2948,11 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short use_shared_key =1 ; } le_tmp =cpu_to_le16 (val16); -/* DBG_871X("%s auth_algo = %s auth_seq =%d\n", __func__, (pmlmeinfo->auth_algo == 0)?"OPEN":"SHARED", pmlmeinfo->auth_seq); */ /* setting IV for auth seq #3 */ if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) {__le32 le_tmp32; -/* DBG_871X("==> iv(%d), key_index(%d)\n", pmlmeinfo->iv, pmlmeinfo->key_index); */ val32 = ((pmlmeinfo->iv++) | (pmlmeinfo->key_index <<30 )); le_tmp32 =cpu_to_le32 (val32); pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&le_tmp32, &(pattrib->pktlen));
@@ -3211,14 +3193,12 @@ void issue_assocreq(struct adapter *padapter)/* Check if the AP's supported rates are also supported by STA. */ get_rate_set (padapter, sta_bssrate, &sta_bssrate_len); -/* DBG_871X("sta_bssrate_len =%d\n", sta_bssrate_len); */ if (pmlmeext->cur_channel ==14 )/* for JAPAN, channel 14 can only uses B Mode(CCK) */ sta_bssrate_len =4 ;/* for (i = 0; i < sta_bssrate_len; i++) { */ -/* DBG_871X("sta_bssrate[%d]=%02X\n", i, sta_bssrate[i]); */ /* */ for (i =0 ; i <NDIS_802_11_LENGTH_RATES_EX ; i++) {
@@ -3237,10 +3217,8 @@ void issue_assocreq(struct adapter *padapter)/* Avoid the proprietary data rate (22Mbps) of Handlink WSG-4000 AP */ if ((pmlmeinfo->network.SupportedRates[i]|IEEE80211_BASIC_RATE_MASK ) == (sta_bssrate[j]|IEEE80211_BASIC_RATE_MASK )) { -/* DBG_871X("match i = %d, j =%d\n", i, j); */ break ; }else { -/* DBG_871X("not match: %02X != %02X\n", (pmlmeinfo->network.SupportedRates[i]|IEEE80211_BASIC_RATE_MASK), (sta_bssrate[j]|IEEE80211_BASIC_RATE_MASK)); */ } }
@@ -3343,8 +3321,6 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,struct mlme_ext_priv *pmlmeext;struct mlme_ext_info *pmlmeinfo; -/* DBG_871X("%s:%d\n", __func__, power_mode); */ -if (!padapter) goto exit;
@@ -3618,8 +3594,6 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da,int ret = _FAIL;__le16 le_tmp; -/* DBG_871X("%s to "MAC_FMT"\n", __func__, MAC_ARG(da)); */ - pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (pmgntframe ==NULL ) { goto exit;
@@ -4093,8 +4067,6 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)if (psta ==NULL )return _SUCCESS; -/* DBG_871X("%s:%s\n", __func__, (initiator == 0)?"RX_DIR":"TX_DIR"); */ -if (initiator ==0 ) {/* recipient */ for (tid =0 ; tid <MAXTID ; tid++) {if (psta->recvreorder_ctrl[tid].enable) {
@@ -4106,7 +4078,6 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) } } }else if (initiator ==1 ) {/* originator */ -/* DBG_871X("tx agg_enable_bitmap(0x%08x)\n", psta->htpriv.agg_enable_bitmap); */ for (tid =0 ; tid <MAXTID ; tid++) {if (psta->htpriv.agg_enable_bitmap &BIT (tid)) {issue_action_BA (padapter, addr,RTW_WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F ));
@@ -4154,7 +4125,6 @@ unsigned int send_beacon(struct adapter *padapter)if (passing_time >100 || issue >3 ) {}/* else */ -/* DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __func__, issue, poll, passing_time); */ return _SUCCESS; }
@@ -4315,7 +4285,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str len = packet_len -sizeof (struct ieee80211_hdr_3addr );if (len >MAX_IE_SZ ) { -/* DBG_871X("IE too long for survey event\n"); */ return _FAIL; }
@@ -4571,7 +4540,6 @@ void start_clnt_join(struct adapter *padapter)report_join_res (padapter,1 ); }else { -/* DBG_871X("marc: invalid cap:%x\n", caps); */ return ; }
@@ -5337,8 +5305,6 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta; -/* DBG_871X("set_sta_rate\n"); */ - psta->wireless_mode = pmlmeext->cur_wireless_mode;/* set per sta rate after updating HT cap. */
@@ -5617,8 +5583,6 @@ void survey_timer_hdl(struct timer_list *t)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -/* DBG_871X("marc: survey timer\n"); */ -/* issue rtw_sitesurvey_cmd */ if (pmlmeext->sitesurvey_res.state >SCAN_START ) {if (pmlmeext->sitesurvey_res.state ==SCAN_PROCESS ) {
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +0 -23
@@ -98,12 +98,10 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)bool ret = false;if (adapter_to_pwrctl (adapter)->bpower_saving) { -/* DBG_871X("%s: already in LPS or IPS mode\n", __func__); */ goto exit; }if (time_before (jiffies,adapter_to_pwrctl (adapter)->ips_deny_time)) { -/* DBG_871X("%s ips_deny_time\n", __func__); */ goto exit; }
@@ -231,7 +229,6 @@ void traffic_check_for_leave_lps(struct adapter *padapter, u8 tx, u32 tx_packets }if (bLeaveLPS) -/* DBG_871X("leave lps via %s, Tx = %d, Rx = %d\n", tx?"Tx":"Rx", pmlmepriv->LinkDetectInfo.NumTxOkInPeriod, pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */ /* rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1); */ rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_LEAVE , tx?0 :1 ); }
@@ -540,8 +537,6 @@ void LPS_Enter(struct adapter *padapter, const char *msg) }else pwrpriv->LpsIdleCount++; } - -/* DBG_871X("-LeisurePSEnter\n"); */ }/* */
@@ -556,8 +551,6 @@ void LPS_Leave(struct adapter *padapter, const char *msg)struct pwrctrl_priv *pwrpriv =dvobj_to_pwrctl (dvobj);char buf[32 ] = {0 }; -/* DBG_871X("+LeisurePSLeave\n"); */ -if (hal_btcoex_IsBtControlLps (padapter))return ;
@@ -572,8 +565,6 @@ void LPS_Leave(struct adapter *padapter, const char *msg) } pwrpriv->bpower_saving = false; -/* DBG_871X("-LeisurePSLeave\n"); */ - }void LeaveAllPowerSaveModeDirect (struct adapter *Adapter)
@@ -739,7 +730,6 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work) pwrpriv = container_of(work, struct pwrctrl_priv, rpwmtimeoutwi); dvobj =pwrctl_to_dvobj (pwrpriv); padapter = dvobj->if1; -/* DBG_871X("+%s: rpwm = 0x%02X cpwm = 0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm); */ mutex_lock (&pwrpriv->lock);if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >=PS_STATE_S2 )) {
@@ -1299,9 +1289,6 @@ void rtw_ps_deny(struct adapter *padapter, enum PS_DENY_REASON reason) {struct pwrctrl_priv *pwrpriv; -/* DBG_871X("+" FUNC_ADPT_FMT ": Request PS deny for %d (0x%08X)\n", */ -/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ - pwrpriv =adapter_to_pwrctl (padapter);mutex_lock (&pwrpriv->lock);
@@ -1309,9 +1296,6 @@ void rtw_ps_deny(struct adapter *padapter, enum PS_DENY_REASON reason) } pwrpriv->ps_deny |=BIT (reason);mutex_unlock (&pwrpriv->lock); - -/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ -/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ }/*
@@ -1322,10 +1306,6 @@ void rtw_ps_deny_cancel(struct adapter *padapter, enum PS_DENY_REASON reason) {struct pwrctrl_priv *pwrpriv; - -/* DBG_871X("+" FUNC_ADPT_FMT ": Cancel PS deny for %d(0x%08X)\n", */ -/* FUNC_ADPT_ARG(padapter), reason, BIT(reason)); */ - pwrpriv =adapter_to_pwrctl (padapter);mutex_lock (&pwrpriv->lock);
@@ -1333,9 +1313,6 @@ void rtw_ps_deny_cancel(struct adapter *padapter, enum PS_DENY_REASON reason) } pwrpriv->ps_deny &= ~BIT (reason);mutex_unlock (&pwrpriv->lock); - -/* DBG_871X("-" FUNC_ADPT_FMT ": Now PS deny for 0x%08X\n", */ -/* FUNC_ADPT_ARG(padapter), pwrpriv->ps_deny); */ }/*
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -22
@@ -340,7 +340,6 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0 ];RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic: bcmc key\n" )); -/* DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d), pmlmeinfo->key_index(%d) , recv key_id(%d)\n", */ /* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */ if (psecuritypriv->binstallGrpkey == false) {
@@ -642,7 +641,6 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_framestop_sta_xmit (padapter, psta); -/* DBG_871X("to sleep, sta_dz_bitmap =%x\n", pstapriv->sta_dz_bitmap); */ } }else {if (psta->state &WIFI_SLEEP_STATE ) {
@@ -650,8 +648,6 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame/* pstapriv->sta_dz_bitmap &= ~BIT(psta->aid); */ wakeup_sta_to_xmit (padapter, psta); - -/* DBG_871X("to wakeup, sta_dz_bitmap =%x\n", pstapriv->sta_dz_bitmap); */ } }
@@ -764,8 +760,6 @@ sint sta2sta_data_frame(u8 *sta_addr =NULL ;sint bmcast =IS_MCAST (pattrib->dst); -/* DBG_871X("[%s] %d, seqnum:%d\n", __func__, __LINE__, pattrib->seq_num); */ -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) {
@@ -962,8 +956,6 @@ sint ap2sta_data_frame(/* for AP multicast issue , modify by yiwei */ static unsigned long send_issue_deauth_time; -/* DBG_871X("After send deauth , %u ms has elapsed.\n", jiffies_to_msecs(jiffies - send_issue_deauth_time)); */ -if (jiffies_to_msecs (jiffies - send_issue_deauth_time) >10000 || send_issue_deauth_time ==0 ) { send_issue_deauth_time = jiffies;
@@ -1050,8 +1042,6 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_struct sta_info *psta =NULL ;/* uint len = precv_frame->u.hdr.len; */ -/* DBG_871X("+validate_recv_ctrl_frame\n"); */ -if (GetFrameType (pframe) !=WIFI_CTRL_TYPE )return _FAIL;
@@ -1130,15 +1120,11 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ pxmitframe->attrib.triggered =1 ; -/* DBG_871X("handling ps-poll, q_len =%d, tim =%x\n", psta->sleepq_len, pstapriv->tim_bitmap); */ -rtw_hal_xmitframe_enqueue (padapter, pxmitframe);if (psta->sleepq_len ==0 ) { pstapriv->tim_bitmap &= ~BIT (psta->aid); -/* DBG_871X("after handling ps-poll, tim =%x\n", pstapriv->tim_bitmap); */ -/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ update_beacon (padapter, _TIM_IE_,NULL , true);
@@ -1151,7 +1137,6 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_/* spin_unlock_bh(&psta->sleep_q.lock); */ spin_unlock_bh (&pxmitpriv->lock); -/* DBG_871X("no buffered packets to xmit\n"); */ if (pstapriv->tim_bitmap&BIT (psta->aid)) {if (psta->sleepq_len ==0 ) {/* issue nulldata with More data bit = 0 to indicate we have no buffered packets */
@@ -1396,10 +1381,8 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec/* verify BIP MME IE of broadcast/multicast de-auth/disassoc packet */ BIP_ret =rtw_BIP_verify (adapter, (u8 *)precv_frame);if (BIP_ret == _FAIL) { -/* DBG_871X("802.11w BIP verify fail\n"); */ goto validate_80211w_fail; }else if (BIP_ret ==RTW_RX_HANDLED ) { -/* DBG_871X("802.11w recv none protected packet\n"); */ /* issue sa query request */ issue_action_SA_Query (adapter,NULL ,0 ,0 ); goto validate_80211w_fail;
@@ -2102,8 +2085,6 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr/* indicate this recv_frame */ /* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */ if (!pattrib->amsdu) { -/* DBG_871X("recv_indicatepkts_in_order, amsdu!= 1, indicate_seq =%d, seq_num =%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); */ -if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false))rtw_recv_indicatepkt (padapter, prframe);/* indicate this recv_frame */
@@ -2268,8 +2249,6 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)if (padapter->bDriverStopped || padapter->bSurpriseRemoved)return ; -/* DBG_871X("+rtw_reordering_ctrl_timeout_handler() =>\n"); */ -spin_lock_bh (&ppending_recvframe_queue->lock);if (recv_indicatepkts_in_order (padapter, preorder_ctrl, true) == true)
@@ -2444,7 +2423,6 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe) !psecuritypriv->busetkipkey) {DBG_COUNTER (padapter->rx_logs.core_rx_enqueue);rtw_enqueue_recvframe (rframe, &padapter->recvpriv.uc_swdec_pending_queue); -/* DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__); */ if (recvpriv->free_recvframe_cnt <NR_RECVFRAME /4 ) {/* to prevent from recvframe starvation, get recvframe from uc_swdec_pending_queue to free_recvframe_cnt */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -5
@@ -1302,7 +1302,6 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)if (pht_info) { bcn_channel = pht_info->primary_channel; }else {/* we don't find channel IE, so don't check it */ -/* DBG_871X("Oops: %s we don't find channel IE, so don't check it\n", __func__); */ bcn_channel = Adapter->mlmeextpriv.cur_channel; } }
@@ -1819,8 +1818,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) tsf = tsf <<32 ; tsf |=le32_to_cpu (*pbuf); -/* DBG_871X("%s(): tsf_upper = 0x%08x, tsf_lower = 0x%08x\n", __func__, (u32)(tsf>>32), (u32)tsf); */ -/* delay = (timestamp mod 1024*100)/1000 (unit: ms) */ /* delay_ms = do_div(tsf, (pmlmeinfo->bcn_interval*1024))/1000; */ delay_ms =do_div (tsf, (pmlmeinfo->bcn_interval*1024 ));
@@ -1834,12 +1831,10 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)/* pmlmeext->bcn_delay_ratio[delay_ms] = (pmlmeext->bcn_delay_cnt[delay_ms] * 100) /pmlmeext->bcn_cnt; */ /* -DBG_871X("%s(): (a)bcn_cnt = %d\n", __func__, pmlmeext->bcn_cnt); for (i = 0; i<9; i++) { -DBG_871X("%s():bcn_delay_cnt[%d]=%d, bcn_delay_ratio[%d]=%d\n", __func__, i, pmlmeext->bcn_delay_cnt[i] , i, pmlmeext->bcn_delay_ratio[i]); } */
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -2
@@ -1522,7 +1522,6 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize) pstr = pStrBuf; leftSize = bufSize; -/* DBG_871X(FUNC_ADPT_FMT ": bufsize =%d\n", FUNC_ADPT_ARG(padapter), bufSize); */ count =rtw_sprintf (pstr, leftSize,"#define DBG\t%d\n" ,DBG );if ((count <0 ) || (count >= leftSize))
@@ -1631,7 +1630,6 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize) exit: count = pstr - pStrBuf; -/* DBG_871X(FUNC_ADPT_FMT ": usedsize =%d\n", FUNC_ADPT_ARG(padapter), count); */ return count; }
drivers/staging/rtl8723bs/hal/hal_com.c +0 -1
@@ -1669,7 +1669,6 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)u32 res, i =0 ;u32 *Array = Array_kfreemap;u32 v1 =0 , v2 =0 , target =0 ; -/* DBG_871X("+%s value: 0x%02x+\n", __func__, value); */ if (value &BIT4 ) {if (padapter->eeprompriv.EEPROMRFGainVal !=0xff ) {
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +0 -78
284 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm.c +0 -3
@@ -1383,12 +1383,9 @@ void ODM_TXPowerTrackingCheck(PDM_ODM_T pDM_Odm)if (!pDM_Odm->RFCalibrateInfo.TM_Trigger) {/* at least delay 1 sec */ PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_T_METER_NEW , (BIT17 |BIT16 ),0x03 ); -/* DBG_871X("Trigger Thermal Meter!!\n"); */ - pDM_Odm->RFCalibrateInfo.TM_Trigger =1 ;return ; }else { -/* DBG_871X("Schedule TxPowerTracking direct call!!\n"); */ ODM_TXPowerTrackingCallback_ThermalMeter (Adapter); pDM_Odm->RFCalibrateInfo.TM_Trigger =0 ; }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +0 -30
@@ -129,9 +129,6 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; - -/* DBG_871X("%s\n", __func__); */ - pwlanhdr = (struct ieee80211_hdr *)pframe; fctrl = &(pwlanhdr->frame_control);
@@ -165,7 +162,6 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) pktlen +=2 ;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { -/* DBG_871X("ie len =%d\n", cur_network->IELength); */ pktlen += cur_network->IELength -sizeof (struct ndis_802_11_fix_ie );memcpy (pframe, cur_network->IEs+sizeof (struct ndis_802_11_fix_ie ), pktlen);
@@ -211,8 +207,6 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) *pLength = pktlen; -/* DBG_871X("%s bcn_sz =%d\n", __func__, pktlen); */ - }static void ConstructPSPoll (struct adapter *padapter,u8 *pframe,u32 *pLength)
@@ -222,8 +216,6 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -/* DBG_871X("%s\n", __func__); */ - pwlanhdr = (struct ieee80211_hdr *)pframe;/* Frame control. */
@@ -263,9 +255,6 @@ static void ConstructNullFunctionData(struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - -/* DBG_871X("%s:%d\n", __func__, bForcePowerSave); */ - pwlanhdr = (struct ieee80211_hdr *)pframe; fctrl = &pwlanhdr->frame_control;
@@ -991,9 +980,6 @@ void rtl8723b_set_rssi_cmd(struct adapter *padapter, u8 *param)u8 rssi = *(param+2 );u8 uldl_state =0 ; -/* DBG_871X("%s(): param =%.2x-%.2x-%.2x\n", __func__, *param, *(param+1), *(param+2)); */ -/* DBG_871X("%s(): mac_id =%d rssi =%d\n", __func__, mac_id, rssi); */ -SET_8723B_H2CCMD_RSSI_SETTING_MACID (u1H2CRssiSettingParm, mac_id);SET_8723B_H2CCMD_RSSI_SETTING_RSSI (u1H2CRssiSettingParm, rssi);SET_8723B_H2CCMD_RSSI_SETTING_ULDL_STATE (u1H2CRssiSettingParm, uldl_state);
@@ -1126,8 +1112,6 @@ void rtl8723b_set_FwPsTuneParam_cmd(struct adapter *padapter)u8 ps_timeout =20 ;/* ms Keep awake when tx */ u8 dtim_period =3 ; -/* DBG_871X("%s(): FW LPS mode = %d\n", __func__, psmode); */ -SET_8723B_H2CCMD_PSTUNE_PARM_BCN_TO_LIMIT (u1H2CPsTuneParm, bcn_to_limit);SET_8723B_H2CCMD_PSTUNE_PARM_DTIM_TIMEOUT (u1H2CPsTuneParm, dtim_timeout);SET_8723B_H2CCMD_PSTUNE_PARM_PS_TIMEOUT (u1H2CPsTuneParm, ps_timeout);
@@ -1429,8 +1413,6 @@ static void rtl8723b_set_FwRsvdPagePkt(#endif #endif -/* DBG_871X("%s---->\n", __func__); */ - pxmitpriv = &padapter->xmitpriv; pmlmeext = &padapter->mlmeextpriv; pmlmeinfo = &pmlmeext->mlmext_info;
@@ -1467,9 +1449,6 @@ static void rtl8723b_set_FwRsvdPagePkt(ConstructPSPoll (padapter, &ReservedPagePacket[BufIndex], &PSPollLength);rtl8723b_fill_fake_txdesc (padapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, true, false, false); -/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: PS-POLL %p %d\n", */ -/* __func__, &ReservedPagePacket[BufIndex-TxDescLen], (PSPollLength+TxDescLen)); */ - CurtPktPageNum = (u8 )PageNum_128 (TxDescLen + PSPollLength); TotalPageNum += CurtPktPageNum;
@@ -1487,9 +1466,6 @@ static void rtl8723b_set_FwRsvdPagePkt( );rtl8723b_fill_fake_txdesc (padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, false, false, false); -/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: NULL DATA %p %d\n", */ -/* __func__, &ReservedPagePacket[BufIndex-TxDescLen], (NullDataLength+TxDescLen)); */ - CurtPktPageNum = (u8 )PageNum_128 (TxDescLen + NullDataLength); TotalPageNum += CurtPktPageNum;
@@ -1507,9 +1483,6 @@ static void rtl8723b_set_FwRsvdPagePkt( );rtl8723b_fill_fake_txdesc (padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, false, false, false); -/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */ -/* __func__, &ReservedPagePacket[BufIndex-TxDescLen], (QosNullLength+TxDescLen)); */ - CurtPktPageNum = (u8 )PageNum_128 (TxDescLen + QosNullLength); TotalPageNum += CurtPktPageNum;
@@ -1527,9 +1500,6 @@ static void rtl8723b_set_FwRsvdPagePkt( );rtl8723b_fill_fake_txdesc (padapter, &ReservedPagePacket[BufIndex-TxDescLen], BTQosNullLength, false, true, false); -/* DBG_871X("%s(): HW_VAR_SET_TX_CMD: BT QOS NULL DATA %p %d\n", */ -/* __func__, &ReservedPagePacket[BufIndex-TxDescLen], (BTQosNullLength+TxDescLen)); */ - CurtPktPageNum = (u8 )PageNum_128 (TxDescLen + BTQosNullLength); TotalPageNum += CurtPktPageNum;
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -13
@@ -834,7 +834,6 @@ static void hal_ReadEFuse_WiFi(u16 i, total, used;u8 efuse_usage =0 ; -/* DBG_871X("YJ: ====>%s():_offset =%d _size_byte =%d bPseudoTest =%d\n", __func__, _offset, _size_byte, bPseudoTest); */ /* */ /* Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. */ /* */
@@ -2820,8 +2819,6 @@ u8 BWMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)u8 BWSettingOfDesc =0 ;struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); -/* DBG_871X("BWMapping pHalData->CurrentChannelBW %d, pattrib->bwmode %d\n", pHalData->CurrentChannelBW, pattrib->bwmode); */ -if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_80 ) {if (pattrib->bwmode ==CHANNEL_WIDTH_80 ) BWSettingOfDesc =2 ;
@@ -2848,8 +2845,6 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)u8 SCSettingOfDesc =0 ;struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); -/* DBG_871X("SCMapping: pHalData->CurrentChannelBW %d, pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n", pHalData->CurrentChannelBW, pHalData->nCur80MhzPrimeSC, pHalData->nCur40MhzPrimeSC); */ -if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_80 ) {if (pattrib->bwmode ==CHANNEL_WIDTH_80 ) { SCSettingOfDesc =VHT_DATA_SC_DONOT_CARE ;
@@ -2873,8 +2868,6 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib) {} } }else if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) { -/* DBG_871X("SCMapping: HT Case: pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d\n", pHalData->CurrentChannelBW, pHalData->nCur40MhzPrimeSC); */ -if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) { SCSettingOfDesc =VHT_DATA_SC_DONOT_CARE ; }else if (pattrib->bwmode ==CHANNEL_WIDTH_20 ) {
@@ -3565,9 +3558,6 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len)#define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER (_Header) LE_BITS_TO_1BYTE((_Header + 0), 6, 1)#define GET_8723B_C2H_TX_RPT_RETRY_OVER (_Header) LE_BITS_TO_1BYTE((_Header + 0), 7, 1) -/* DBG_871X("%s, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n", __func__, */ -/* *pdata, *(pdata+1), *(pdata+2), *(pdata+3), *(pdata+4), *(pdata+5), *(pdata+6), *(pdata+7)); */ - seq_no = *(pdata+6 );if (GET_8723B_C2H_TX_RPT_RETRY_OVER (pdata) |GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER (pdata)) {
@@ -3575,7 +3565,6 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len) }/* else if (seq_no != padapter->xmitpriv.seq_no) { -DBG_871X("tx_seq_no =%d, rpt_seq_no =%d\n", padapter->xmitpriv.seq_no, seq_no); rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); } */
@@ -3705,8 +3694,6 @@ void C2HPacketHandler_8723B(struct adapter *padapter, u8 *pbuffer, u16 length) C2hEvent.CmdLen = length-2 ; tmpBuf = pbuffer+2 ; -/* DBG_871X("%s C2hEvent.CmdID:%x C2hEvent.CmdLen:%x C2hEvent.CmdSeq:%x\n", */ -/* __func__, C2hEvent.CmdID, C2hEvent.CmdLen, C2hEvent.CmdSeq); */ RT_PRINT_DATA (_module_hal_init_c_, _drv_notice_,"C2HPacketHandler_8723B(): Command Content:\n" , tmpBuf, C2hEvent.CmdLen);process_c2h_event (padapter, &C2hEvent, tmpBuf);
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +0 -5
@@ -38,7 +38,6 @@ static void update_recvframe_attrib(struct adapter *padapter,/* update rx report to recv_frame attribute */ pattrib->pkt_rpt_type = prxreport->c2h_ind ?C2H_PACKET :NORMAL_RX ; -/* DBG_871X("%s: pkt_rpt_type =%d\n", __func__, pattrib->pkt_rpt_type); */ if (pattrib->pkt_rpt_type ==NORMAL_RX ) {/* Normal rx packet */
@@ -165,8 +164,6 @@ static void rtl8723bs_c2h_packet_handler(struct adapter *padapter,if (length ==0 )return ; -/* DBG_871X("+%s() length =%d\n", __func__, length); */ - tmp =rtw_zmalloc (length);if (!tmp)return ;
@@ -177,8 +174,6 @@ static void rtl8723bs_c2h_packet_handler(struct adapter *padapter,if (!res)kfree (tmp); - -/* DBG_871X("-%s res(%d)\n", __func__, res); */ } static inline union recv_frame *try_alloc_recvframe(struct recv_priv *precvpriv,
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -2
@@ -702,13 +702,11 @@ void sa_query_timer_hdl(struct timer_list *t);#define set_survey_timer (mlmeext, ms) \ do { \ -/*DBG_871X("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ _set_timer(&(mlmeext)->survey_timer, (ms)); \ } while (0)#define set_link_timer (mlmeext, ms) \ do { \ -/*DBG_871X("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ _set_timer(&(mlmeext)->link_timer, (ms)); \ } while (0)#define set_sa_query_timer (mlmeext, ms) \
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +0 -1
@@ -310,7 +310,6 @@ struct pwrctrl_priv {#define _rtw_set_pwr_state_check_timer (pwrctl, ms) \ do { \ -/*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctl), (ms));*/ \ _set_timer(&(pwrctl)->pwr_state_check_timer, (ms)); \ } while (0)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -7
@@ -424,7 +424,6 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) ) { if (!rtw_cfg80211_inform_bss(padapter, scanned)) { } else { - /* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */ } } else {rtw_warn_on (1 );
@@ -458,8 +457,6 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);struct wlan_network *scanned = pmlmepriv->cur_network_scanned; -/* DBG_871X(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */ -if (scanned ==NULL ) {rtw_warn_on (1 ); goto check_bss;
@@ -470,7 +467,6 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) ) { if (!rtw_cfg80211_inform_bss(padapter, scanned)) { } else { - /* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */ } } else {rtw_warn_on (1 );
@@ -967,13 +963,12 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param }else if (strcmp (param->u.crypt.alg,"BIP" ) ==0 ) { -/* DBG_871X("BIP key_len =%d , index =%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); */ /* save the IGTK key, length 16 bytes */ memcpy (padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len)); -/*DBG_871X("IGTK key below:\n"); +/* for (no = 0;no<16;no++) printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); -DBG_871X("\n");*/ +*/ padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; padapter->securitypriv.binstallBIPkey = true; }
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0 -34
@@ -42,8 +42,6 @@ void indicate_wx_scan_complete_event(struct adapter *padapter)union iwreq_data wrqu;memset (&wrqu,0 ,sizeof (union iwreq_data )); - -/* DBG_871X("+rtw_indicate_wx_scan_complete_event\n"); */ }
@@ -213,7 +211,6 @@ static char *translate_scan(struct adapter *padapter,if (mcs_rate&0x8000 ) {/* MCS15 */ max_rate = (bw_40MHz) ? ((short_GI)?300 :270 ):((short_GI)?144 :130 ); }else {/* default MCS7 */ -/* DBG_871X("wx_get_scan, mcs_rate_bitmap = 0x%x\n", mcs_rate); */ max_rate = (bw_40MHz) ? ((short_GI)?150 :135 ):((short_GI)?72 :65 ); }
@@ -359,8 +356,6 @@ static char *translate_scan(struct adapter *padapter, iwe.u.qual.noise =0 ;/* noise level */ #endif -/* DBG_871X("iqual =%d, ilevel =%d, inoise =%d, iupdated =%d\n", iwe.u.qual.qual, iwe.u.qual.level , iwe.u.qual.noise, iwe.u.qual.updated); */ - start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_QUAL_LEN ); {
@@ -1298,14 +1293,11 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,char sec_len;int ssid_index =0 ; -/* DBG_871X("%s COMBO_SCAN header is recognized\n", __func__); */ -while (len >=1 ) { section = *(pos++); len -=1 ;switch (section) {case WEXT_CSCAN_SSID_SECTION : -/* DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); */ if (len <1 ) { len =0 ;break ;
@@ -1318,8 +1310,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, sec_len <= 32) { ssid[ssid_index].SsidLength = sec_len;memcpy (ssid[ssid_index].Ssid, pos, sec_len); -/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */ -/* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */ ssid_index++; }
@@ -1328,31 +1318,23 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,case WEXT_CSCAN_CHANNEL_SECTION : -/* DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); */ pos +=1 ; len -=1 ;break ;case WEXT_CSCAN_ACTV_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); */ pos +=2 ; len -=2 ;break ;case WEXT_CSCAN_PASV_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); */ pos +=2 ; len -=2 ;break ;case WEXT_CSCAN_HOME_DWELL_SECTION : -/* DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); */ pos +=2 ; len -=2 ;break ;case WEXT_CSCAN_TYPE_SECTION : -/* DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); */ pos +=1 ; len -=1 ;break ;default : -/* DBG_871X("Unknown CSCAN section %c\n", section); */ len =0 ;/* stop parsing */ } -/* DBG_871X("len:%d\n", len); */ - }/* jeff: it has still some scan parameter to parse, we only do this now... */
@@ -2284,7 +2266,6 @@ static int rtw_wx_write_rf(struct net_device *dev, path = *(u32 *)extra; addr = *((u32 *)extra +1 ); data32 = *((u32 *)extra +2 ); -/* DBG_871X("%s: path =%d addr = 0x%02x data = 0x%05x\n", __func__, path, addr, data32); */ rtw_hal_write_rfreg (padapter, path, addr,0xFFFFF , data32);return 0 ;
@@ -2302,8 +2283,6 @@ static int dummy(struct net_device *dev, struct iw_request_info *a,/* struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); */ /* struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); */ -/* DBG_871X("cmd_code =%x, fwstate = 0x%x\n", a->cmd, get_fwstate(pmlmepriv)); */ -return -1 ; }
@@ -2552,7 +2531,6 @@ static int rtw_rereg_nd_name(struct net_device *dev, rereg_priv->old_ifname[IFNAMSIZ -1 ] =0 ; } -/* DBG_871X("%s wrqu->data.length:%d\n", __func__, wrqu->data.length); */ if (wrqu->data.length >IFNAMSIZ )return -EFAULT ;
@@ -3115,7 +3093,6 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value)case IEEE_PARAM_WPAX_SELECT :/* added for WPA2 mixed mode */ -/* DBG_871X(KERN_WARNING "------------------------>wpax value = %x\n", value); */ /* spin_lock_irqsave(&ieee->wpax_suitlist_lock, flags); ieee->wpax_type_set = 1;
@@ -3527,7 +3504,6 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) psta =rtw_get_stainfo (pstapriv, param->sta_addr);if (psta) { -DBG_871X ("rtw_add_sta(), free has been added psta =%p\n" , psta);spin_lock_bh (&(pstapriv->sta_hash_lock));rtw_free_stainfo (padapter, psta);spin_unlock_bh (&(pstapriv->sta_hash_lock));
@@ -3540,8 +3516,6 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)if (psta) {int flags = param->u.add_sta.flags; -/* DBG_871X("rtw_add_sta(), init sta's variables, psta =%p\n", psta); */ - psta->aid = param->u.add_sta.aid;/* aid = 1~2007 */ memcpy (psta->bssrateset, param->u.add_sta.tx_supp_rates,16 );
@@ -3600,8 +3574,6 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)if (psta) {u8 updated = false; -/* DBG_871X("free psta =%p, aid =%d\n", psta, psta->aid); */ -spin_lock_bh (&pstapriv->asoc_list_lock);if (list_empty (&psta->asoc_list) == false) {list_del_init (&psta->asoc_list);
@@ -3948,8 +3920,6 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)return -EFAULT ; } -/* DBG_871X("%s, cmd =%d\n", __func__, param->cmd); */ -switch (param->cmd) {case RTL871X_HOSTAPD_FLUSH :
@@ -4140,9 +4110,6 @@ static int rtw_wx_set_priv(struct net_device *dev,vfree (ext_dbg);#endif -/* DBG_871X("rtw_wx_set_priv: (SIOCSIWPRIV) %s ret =%d\n", */ -/* dev->name, ret); */ -return ret; }
@@ -4463,7 +4430,6 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) piwstats->qual.qual =0 ; piwstats->qual.level =0 ; piwstats->qual.noise =0 ; -/* DBG_871X("No link level:%d, qual:%d, noise:%d\n", tmp_level, tmp_qual, tmp_noise); */ }else {#ifdef CONFIG_SIGNAL_DISPLAY_DBM tmp_level =translate_percentage_to_dbm (padapter->recvpriv.signal_strength);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -2
@@ -314,7 +314,6 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)struct sockaddr *addr = p;if (!padapter->bup) { -/* DBG_871X("r8711_net_set_mac_address(), MAC =%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */ /* addr->sa_data[4], addr->sa_data[5]); */ memcpy (padapter->eeprompriv.mac_addr, addr->sa_data,ETH_ALEN );/* memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); */
@@ -1060,7 +1059,6 @@ static int netdev_close(struct net_device *pnetdev)/*if (!padapter->hw_init_completed) { -DBG_871X("(1)871x_drv - drv_close, bup =%d, hw_init_completed =%d\n", padapter->bup, padapter->hw_init_completed); padapter->bDriverStopped = true;
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -1
@@ -133,7 +133,6 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt } }else {/* to APself */ -/* DBG_871X("to APSelf\n"); */ DBG_COUNTER (padapter->rx_logs.os_indicate_ap_self); } }
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +0 -13
@@ -41,7 +41,6 @@ u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return v; }
@@ -77,7 +76,6 @@ s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -112,7 +110,6 @@ s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -146,7 +143,6 @@ s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -181,7 +177,6 @@ s32 sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -211,7 +206,6 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return v; }
@@ -242,7 +236,6 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return v; }
@@ -302,7 +295,6 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return ; }
@@ -331,7 +323,6 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return ; }
@@ -404,7 +395,6 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -459,7 +449,6 @@ s32 sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; } func = psdio->func;
@@ -503,7 +492,6 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
@@ -559,7 +547,6 @@ s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdio = &psdiodev->intf_data;if (padapter->bSurpriseRemoved) { -/* DBG_871X(" %s (padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n", __func__); */ return err; }
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +0 -3
@@ -113,7 +113,6 @@ static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt)if (padapter->registrypriv.wifi_spec) {/* No free space for Tx, tx_worker is too slow */ if (pxmitpriv->hwxmits[queue].accnt >WMM_XMIT_THRESHOLD ) { -/* DBG_871X("%s(): stop netif_subqueue[%d]\n", __func__, queue); */ netif_stop_subqueue (padapter->pnetdev, queue); } }else {
@@ -231,8 +230,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)if (res) goto exit; }else { -/* DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); */ -/* DBG_871X("!m2u); */ DBG_COUNTER (padapter->tx_logs.os_tx_m2u_stop); } }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/10 staging: rtl8723bs: remove all if-else empty blocks left by DBG_871X removal
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit 21e161c3cea5ab3265b540ccb5c4671940306831 ]
remove all if-else empty {} blocks left by spatch application.
removed unused variables and an unused static function definition after if-else blocks removal, to suppress compiler warnings.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 22 +++------- drivers/staging/rtl8723bs/core/rtw_cmd.c | 5 --- .../staging/rtl8723bs/core/rtw_ieee80211.c | 4 -- drivers/staging/rtl8723bs/core/rtw_io.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 3 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 -------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 40 +------------------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 21 ++-------- drivers/staging/rtl8723bs/core/rtw_recv.c | 6 --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 6 --- .../staging/rtl8723bs/core/rtw_wlan_util.c | 8 ---- drivers/staging/rtl8723bs/core/rtw_xmit.c | 24 ----------- drivers/staging/rtl8723bs/hal/hal_com.c | 6 +-- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 32 ++++----------- drivers/staging/rtl8723bs/hal/hal_intf.c | 10 +---- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 10 +---- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 7 ---- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 - .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 -- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 -- drivers/staging/rtl8723bs/hal/sdio_ops.c | 7 +--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 38 +++--------------- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 34 ++-------------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 - .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 20 ---------- 26 files changed, 33 insertions(+), 301 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +5 -17
@@ -205,8 +205,6 @@ void expire_timeout_chk(struct adapter *padapter)/* check auth_queue */ #ifdef DBG_EXPIRATION_CHK -if (phead != plist) { - }#endif while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, auth_list);
@@ -238,8 +236,6 @@ void expire_timeout_chk(struct adapter *padapter)/* check asoc_queue */ #ifdef DBG_EXPIRATION_CHK -if (phead != plist) { - }#endif while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
@@ -403,7 +399,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) arg[3 ] = psta->init_rate;rtw_hal_add_ra_tid (padapter, tx_ra_bitmap, arg, rssi_level); - }else { } }
@@ -480,7 +475,6 @@ void update_bmc_sta(struct adapter *padapter) psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - }else { } }
@@ -684,8 +678,6 @@ static void update_hw_ht_param(struct adapter *padapter) pmlmeinfo->SM_PS = (le16_to_cpu ( pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ) &0x0C ) >>2 ; -if (pmlmeinfo->SM_PS ==WLAN_HT_CAP_SM_PS_STATIC ) - {}/* */ /* Config current HT Protection mode. */
@@ -860,8 +852,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will tx beacon when bcn interrupt coming in. */ /* issue beacon frame */ -if (send_beacon (padapter) == _FAIL) - {} +send_beacon (padapter);#endif /* CONFIG_INTERRUPT_BASED_TXBCN */ }
@@ -1638,9 +1629,6 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui)else if (!memcmp (P2P_OUI , oui,4 ))update_bcn_p2p_ie (padapter); - -else - {} }void update_beacon (struct adapter *padapter,u8 ie_id,u8 *oui,u8 tx)
@@ -1935,8 +1923,6 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->no_ht_set =1 ; pmlmepriv->num_sta_no_ht++; } -if (pmlmepriv->htpriv.ht_option == true) { - } }if (rtw_ht_operation_update (padapter) >0 ) {
@@ -2189,8 +2175,10 @@ void rtw_ap_restore_network(struct adapter *padapter)for (i =0 ; i < chk_alive_num; i++) { psta =rtw_get_stainfo_by_offset (pstapriv, chk_alive_list[i]); -if (psta ==NULL ) { - }else if (psta->state & _FW_LINKED) { +if (psta ==NULL ) +continue ; + +if (psta->state & _FW_LINKED) {rtw_sta_media_status_rpt (padapter, psta,1 );Update_RA_Entry (padapter, psta);/* pairwise key */
drivers/staging/rtl8723bs/core/rtw_cmd.c +0 -5
@@ -392,7 +392,6 @@ int rtw_cmd_thread(void *context)struct cmd_obj *pcmd;u8 *pcmdbuf;unsigned long cmd_start_time; -unsigned long cmd_process_time;u8 (*cmd_hdl)(struct adapter *padapter,u8 *pbuf);void (*pcmd_callback)(struct adapter *dev,struct cmd_obj *pcmd);struct adapter *padapter = context;
@@ -492,10 +491,6 @@ int rtw_cmd_thread(void *context)mutex_unlock (&(pcmd->padapter->cmdpriv.sctx_mutex)); } - cmd_process_time =jiffies_to_msecs (jiffies - cmd_start_time); -if (cmd_process_time >1000 ) { - } -/* call callback function for post-processed */ if (pcmd->cmdcode <ARRAY_SIZE (rtw_cmd_callback)) { pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +0 -4
@@ -870,8 +870,6 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,* OUI of the vendor. The following byte is used a vendor specific * sub-type. */ if (elen <4 ) { -if (show_errors) { - }return -1 ; }
@@ -959,8 +957,6 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, left -=2 ;if (elen > left) { -if (show_errors) { - }return ParseFailed; }
drivers/staging/rtl8723bs/core/rtw_io.c +1 -1
@@ -174,8 +174,8 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)int value =atomic_inc_return (&dvobj->continual_io_error);if (value >MAX_CONTINUAL_IO_ERR ) { ret = true; - }else { } +return ret; }
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -2
@@ -486,8 +486,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)rtw_indicate_disconnect (padapter);/* modify for CONFIG_IEEE80211W, none 11w can use it */ rtw_free_assoc_resources_cmd (padapter); -if (_FAIL ==rtw_pwr_wakeup (padapter)) - {} +rtw_pwr_wakeup (padapter); }spin_unlock_bh (&pmlmepriv->lock);
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -16
@@ -531,8 +531,6 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, dst->Rssi = rssi_final;#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &&1 -if (strcmp (dst->Ssid.Ssid,DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) ==0 ) { - }#endif }
@@ -1093,8 +1091,6 @@ void rtw_scan_abort(struct adapter *adapter) }if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) { -if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) - {}rtw_indicate_scan_done (adapter, true); } pmlmeext->scan_abort = false;
@@ -1782,9 +1778,6 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (adapter->net_closed)return ; -if (is_primary_adapter (adapter)) - {} -if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) && !(hal_btcoex_IsBtControlLps (adapter)) ) {
@@ -1960,9 +1953,6 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme updated = true; } -if (updated) { - } - exit:return updated; }
@@ -2445,8 +2435,6 @@ void rtw_ht_use_default_setting(struct adapter *padapter)if (TEST_FLAG (pregistrypriv->ldpc_cap,BIT5 ))SET_FLAG (phtpriv->ldpc_cap,LDPC_HT_ENABLE_TX ); } -if (phtpriv->ldpc_cap) - {}/* STBC */ rtw_hal_get_def_var (padapter,HAL_DEF_TX_STBC , (u8 *)&bHwSTBCSupport);
@@ -2460,8 +2448,6 @@ void rtw_ht_use_default_setting(struct adapter *padapter)if (TEST_FLAG (pregistrypriv->stbc_cap,BIT4 ))SET_FLAG (phtpriv->stbc_cap,STBC_HT_ENABLE_RX ); } -if (phtpriv->stbc_cap) - {}/* Beamforming setting */ rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMER , (u8 *)&bHwSupportBeamformer);
@@ -2751,8 +2737,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe pmlmeinfo->SM_PS = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &0x0C ) >>2 ; -if (pmlmeinfo->SM_PS ==WLAN_HT_CAP_SM_PS_STATIC ) - {}/* */ /* Config current HT Protection mode. */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -38
@@ -1499,8 +1499,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* get a unique AID */ -if (pstat->aid >0 ) { - }else { +if (pstat->aid ==0 ) {for (pstat->aid =1 ; pstat->aid <=NUM_STA ; pstat->aid++)if (pstapriv->sta_aid[pstat->aid -1 ] ==NULL )break ;
@@ -2855,12 +2854,6 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,#endif } -if (try_cnt && wait_ms) { -if (da) - {} -else - {} - } exit:return ret; }
@@ -3218,12 +3211,10 @@ void issue_assocreq(struct adapter *padapter)if ((pmlmeinfo->network.SupportedRates[i]|IEEE80211_BASIC_RATE_MASK ) == (sta_bssrate[j]|IEEE80211_BASIC_RATE_MASK )) {break ; - }else { } } -if (j == sta_bssrate_len) { - }else { +if (j != sta_bssrate_len) {/* the rate is supported by STA */ bssrate[index++] = pmlmeinfo->network.SupportedRates[i]; }
@@ -3426,12 +3417,6 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow#endif } -if (try_cnt && wait_ms) { -if (da) - {} -else - {} - } exit:return ret; }
@@ -3570,12 +3555,6 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int#endif } -if (try_cnt && wait_ms) { -if (da) - {} -else - {} - } exit:return ret; }
@@ -3671,12 +3650,6 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int#endif } -if (try_cnt && wait_ms) { -if (da) - {} -else - {} - } exit:return ret; }
@@ -4097,7 +4070,6 @@ unsigned int send_beacon(struct adapter *padapter)u8 bxmitok = false;int issue =0 ;int poll =0 ; -unsigned long start = jiffies;rtw_hal_set_hwreg (padapter,HW_VAR_BCN_VALID ,NULL );rtw_hal_set_hwreg (padapter,HW_VAR_DL_BCN_SEL ,NULL );
@@ -4120,12 +4092,6 @@ unsigned int send_beacon(struct adapter *padapter)if (false == bxmitok) {return _FAIL; }else { -unsigned long passing_time =jiffies_to_msecs (jiffies - start); - -if (passing_time >100 || issue >3 ) - {} -/* else */ -return _SUCCESS; } }
@@ -4419,8 +4385,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str }#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &1 -if (strcmp (bssid->Ssid.Ssid,DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) ==0 ) { - }#endif /* mark bss info receiving from nearby channel as SignalQuality 101 */
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +3 -18
@@ -250,8 +250,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv) pslv =PS_STATE (pslv); -if (pwrpriv->brpwmtimeout) { - }else { +if (!pwrpriv->brpwmtimeout) {if ((pwrpriv->rpwm == pslv) || ((pwrpriv->rpwm >=PS_STATE_S2 ) && (pslv >=PS_STATE_S2 ))) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
@@ -594,8 +593,7 @@ void LeaveAllPowerSaveModeDirect(struct adapter *Adapter)rtw_lps_ctrl_wk_cmd (pri_padapter,LPS_CTRL_LEAVE ,0 ); }else {if (pwrpriv->rf_pwrstate == rf_off) -if (!ips_leave (pri_padapter)) - {} +ips_leave (pri_padapter); } }
@@ -628,8 +626,7 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter)LPS_Leave_check (Adapter); }else {if (adapter_to_pwrctl (Adapter)->rf_pwrstate == rf_off) { -if (!ips_leave (Adapter)) - {} +ips_leave (Adapter); } } }
@@ -1173,10 +1170,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *calif (pwrpriv->ps_processing) {while (pwrpriv->ps_processing &&jiffies_to_msecs (jiffies - start) <=3000 )mdelay (10 ); -if (pwrpriv->ps_processing) - {} -else - {} }if (!(pwrpriv->bInternalAutoSuspend) && pwrpriv->bInSuspend) {
@@ -1185,10 +1178,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal ) {mdelay (10 ); } -if (pwrpriv->bInSuspend) - {} -else - {} }/* System suspend is not allowed to wakeup */
@@ -1292,8 +1281,6 @@ void rtw_ps_deny(struct adapter *padapter, enum PS_DENY_REASON reason) pwrpriv =adapter_to_pwrctl (padapter);mutex_lock (&pwrpriv->lock); -if (pwrpriv->ps_deny &BIT (reason)) { - } pwrpriv->ps_deny |=BIT (reason);mutex_unlock (&pwrpriv->lock); }
@@ -1309,8 +1296,6 @@ void rtw_ps_deny_cancel(struct adapter *padapter, enum PS_DENY_REASON reason) pwrpriv =adapter_to_pwrctl (padapter);mutex_lock (&pwrpriv->lock); -if ((pwrpriv->ps_deny &BIT (reason)) ==0 ) { - } pwrpriv->ps_deny &= ~BIT (reason);mutex_unlock (&pwrpriv->lock); }
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -6
@@ -249,9 +249,6 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter) cnt++; } -if (cnt) - {} -return cnt; }
@@ -2405,9 +2402,6 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe)DBG_COUNTER (padapter->rx_logs.core_rx_dequeue);recv_func_posthandle (padapter, pending_frame); } - -if (cnt) - {} }DBG_COUNTER (padapter->rx_logs.core_rx);
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +0 -6
@@ -106,17 +106,11 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta) {int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof (struct sta_info ); -if (!stainfo_offset_valid (offset)) - {} -return offset; }inline struct sta_info *rtw_get_stainfo_by_offset (struct sta_priv *stapriv,int offset) { -if (!stainfo_offset_valid (offset)) - {} -return (struct sta_info *)(stapriv->pstainfo_buf + offset *sizeof (struct sta_info )); }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -8
@@ -383,9 +383,6 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne {u8 center_ch, chnl_offset80 =HAL_PRIME_CHNL_OFFSET_DONT_CARE ; -if (padapter->bNotifyChannelChange) - {} - center_ch =rtw_get_center_ch (channel, bwmode, channel_offset);if (bwmode ==CHANNEL_WIDTH_80 ) {
@@ -626,11 +623,6 @@ static s16 _rtw_camid_search(struct adapter *adapter, u8 *addr, s16 kid)break ; } -if (addr) - {} -else - {} -return cam_id; }
drivers/staging/rtl8723bs/core/rtw_xmit.c +0 -24
@@ -1496,7 +1496,6 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv,if (pxmitbuf->sctx) {rtw_sctx_done_err (&pxmitbuf->sctx,RTW_SCTX_DONE_BUF_ALLOC ); } - }else { }return pxmitbuf;
@@ -1632,8 +1631,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) } }#ifdef DBG_XMIT_BUF - else - {}#endif spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irqL);
@@ -2087,8 +2084,6 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) pxmitframe =rtw_alloc_xmitframe (pxmitpriv);if (jiffies_to_msecs (jiffies - start) >2000 ) { -if (drop_cnt) - {} start = jiffies; drop_cnt =0 ; }
@@ -2711,26 +2706,9 @@ int rtw_sctx_wait(struct submit_ctx *sctx, const char *msg)return ret; } -static bool rtw_sctx_chk_warning_status (int status) -{ -switch (status) { -case RTW_SCTX_DONE_UNKNOWN : -case RTW_SCTX_DONE_BUF_ALLOC : -case RTW_SCTX_DONE_BUF_FREE : - -case RTW_SCTX_DONE_DRV_STOP : -case RTW_SCTX_DONE_DEV_REMOVE : -return true; -default : -return false; - } -} -void rtw_sctx_done_err (struct submit_ctx **sctx,int status) {if (*sctx) { -if (rtw_sctx_chk_warning_status (status)) - {} (*sctx)->status = status;complete (&((*sctx)->done)); *sctx =NULL ;
@@ -2759,6 +2737,4 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)if (pxmitpriv->ack_tx)rtw_sctx_done_err (&pack_tx_ops, status); -else - {} }
drivers/staging/rtl8723bs/hal/hal_com.c +2 -4
@@ -1688,8 +1688,6 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)/* res |= (padapter->eeprompriv.EEPROMRFGainVal & 0x0f)<< 15; */ /* rtw_hal_write_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, RF_GAIN_OFFSET_MASK, res); */ res =rtw_hal_read_rfreg (padapter,RF_PATH_A ,0x7f ,0xffffffff ); - }else - {} - }else - {} + } + } }
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +7 -25
@@ -88,8 +88,7 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,default :break ; } - }else - {} + }return value; }
@@ -177,8 +176,7 @@ phy_SetTxPowerByRateBase(default :break ; } - }else - {} + } } static void
@@ -774,9 +772,7 @@ void PHY_StoreTxPowerByRate( pHalData->pwrGroupCnt++; else if (RegAddr == rTxAGC_B_Mcs15_Mcs12 && pHalData->rf_type != RF_1T1R) pHalData->pwrGroupCnt++; - } else - {} - + } } static void
@@ -967,8 +963,7 @@ void PHY_SetTxPowerIndexByRateSection( pHalData->CurrentChannelBW, Channel, vhtRates4T, ARRAY_SIZE(vhtRates4T)); - }else - {} + } }static bool phy_GetChnlIndex (u8 Channel,u8 *ChannelIdx)
@@ -1024,8 +1019,6 @@ u8 PHY_GetTxPowerIndexBase( txPower = pHalData->Index24G_CCK_Base[RFPath][chnlIdx]; else if (MGN_6M <= Rate) txPower = pHalData->Index24G_BW40_Base[RFPath][chnlIdx]; - else - {}/* OFDM-1T */ if ((MGN_6M <= Rate && Rate <=MGN_54M ) && !IS_CCK_RATE (Rate)) {
@@ -1067,8 +1060,6 @@ u8 PHY_GetTxPowerIndexBase( }else {/* 3 ============================== 5 G ============================== */ if (MGN_6M <= Rate) txPower = pHalData->Index5G_BW40_Base[RFPath][chnlIdx]; -else - {}/* OFDM-1T */ if ((MGN_6M <= Rate && Rate <=MGN_54M ) && !IS_CCK_RATE (Rate)) {
@@ -1524,11 +1515,7 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)if (channel5G[i] == Channel) channelIndex = i; } - }else - {} - -if (channelIndex ==-1 ) - {} + }return channelIndex; }
@@ -1639,9 +1626,6 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, idx_bandwidth =get_bandwidth_idx (bandwidth); idx_rate_sctn =get_rate_sctn_idx (data_rate); -if (band_type ==BAND_ON_5G && idx_rate_sctn ==0 ) - {} -/* workaround for wrong index combination to obtain tx power limit, */ /* OFDM only exists in BW 20M */ /* CCK table will only be given in BW 20M */
@@ -1696,7 +1680,6 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, [idx_rate_sctn] [idx_channel] [rf_path]; - }else { }/* combine 5G VHT & HT rate */
@@ -1855,9 +1838,8 @@ void PHY_SetTxPowerLimit(u8 regulation =0 , bandwidth =0 , rateSection =0 , channel;s8 powerLimit =0 , prevPowerLimit, channelIndex; -if (!GetU1ByteIntegerFromStringInDecimal ((s8 *)Channel, &channel) || - !GetU1ByteIntegerFromStringInDecimal ((s8 *)PowerLimit, &powerLimit)) - {} +GetU1ByteIntegerFromStringInDecimal ((s8 *)Channel, &channel); +GetU1ByteIntegerFromStringInDecimal ((s8 *)PowerLimit, &powerLimit); powerLimit = powerLimit >MAX_POWER_INDEX ?MAX_POWER_INDEX : powerLimit;
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -9
@@ -123,8 +123,8 @@ uint rtw_hal_deinit(struct adapter *padapter)if (status == _SUCCESS) { padapter = dvobj->padapters; padapter->hw_init_completed = false; - }else { } +return status; }
@@ -176,16 +176,12 @@ void rtw_hal_enable_interrupt(struct adapter *padapter) {if (padapter->HalFunc.enable_interrupt) padapter->HalFunc.enable_interrupt (padapter); -else - {} }void rtw_hal_disable_interrupt (struct adapter *padapter) {if (padapter->HalFunc.disable_interrupt) padapter->HalFunc.disable_interrupt (padapter); -else - {} }u8 rtw_hal_check_ips_status (struct adapter *padapter)
@@ -193,8 +189,6 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter)u8 val = false;if (padapter->HalFunc.check_ips_status) val = padapter->HalFunc.check_ips_status (padapter); -else - {}return val; }
@@ -450,8 +444,6 @@ s32 rtw_hal_fill_h2c_cmd(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8if (padapter->HalFunc.fill_h2c_cmd) ret = padapter->HalFunc.fill_h2c_cmd (padapter, ElementID, CmdLen, pCmdBuffer); -else - {}return ret; }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -9
@@ -996,11 +996,6 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)u8 u1H2CPwrModeParm[H2C_PWRMODE_LEN ] = {0 };u8 PowerState =0 , awake_intvl =1 , byte5 =0 , rlbm =0 ; -if (pwrpriv->dtim >0 ) - {} -else - {} -#ifdef CONFIG_WOWLAN if (psmode ==PS_MODE_DTIM ) {/* For WOWLAN LPS, DTIM = (awake_intvl - 1) */ awake_intvl =3 ;/* DTIM =2 */
@@ -1084,7 +1079,6 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode) pmlmeext->bcn_cnt =0 ; pmlmeext->adaptive_tsf_done = true; - }else { }/* offload to FW if fw version > v15.10
@@ -1930,9 +1924,7 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus) }while (!bcn_valid && DLBcnCount <=100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);if (padapter->bSurpriseRemoved || padapter->bDriverStopped) { - }else if (!bcn_valid) - {} -else { + }else {struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter); pwrctl->fw_psmode_iface_id = padapter->iface_id; }
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -7
@@ -33,9 +33,6 @@ static void _FWDownloadEnable(struct adapter *padapter, bool enable)msleep (1 ); }while (count++ <100 ); -if (count >0 ) - {} -/* 8051 reset */ tmp =rtw_read8 (padapter,REG_MCUFWDL +2 );rtw_write8 (padapter,REG_MCUFWDL +2 , tmp&0xf7 );
@@ -2853,8 +2850,6 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib) SCSettingOfDesc =VHT_DATA_SC_40_LOWER_OF_80MHZ ; else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) SCSettingOfDesc =VHT_DATA_SC_40_UPPER_OF_80MHZ ; - else - {} }else {if ((pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) && (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER )) SCSettingOfDesc =VHT_DATA_SC_20_LOWEST_OF_80MHZ ;
@@ -2864,8 +2859,6 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib) SCSettingOfDesc =VHT_DATA_SC_20_UPPER_OF_80MHZ ; else if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)) SCSettingOfDesc =VHT_DATA_SC_20_UPPERST_OF_80MHZ ; - else - {} } }else if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) {if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) {
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -2
@@ -840,8 +840,6 @@ static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter)struct hal_com_data *pHalData =GET_HAL_DATA (Adapter);/* RT_TRACE(COMP_SCAN, DBG_LOUD, ("phy_SwChnlAndSetBwMode8723B(): bSwChnl %d, bSetChnlBW %d\n", pHalData->bSwChnl, pHalData->bSetChnlBW)); */ -if (Adapter->bNotifyChannelChange) { - }if (Adapter->bDriverStopped || Adapter->bSurpriseRemoved)return ;
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +0 -3
@@ -423,9 +423,6 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter) alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); } - -if (!precvbuf->pskb) { - } }list_add_tail (&precvbuf->list, &precvpriv->free_recv_buf_queue.queue);
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -2
@@ -26,8 +26,6 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)HalQueryTxOQTBufferStatus8723BSdio (padapter);if ((++n %60 ) ==0 ) { -if ((n %300 ) ==0 ) { - }msleep (1 );/* yield(); */ }
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -4
@@ -1077,7 +1077,6 @@ static u32 rtl8723bs_hal_deinit(struct adapter *padapter) cnt++;mdelay (10 ); }while (cnt <100 && (val8 !=0xEA )); - }else { }adapter_to_pwrctl (padapter)->pre_ips_type =0 ;
@@ -1249,9 +1248,6 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)/* This part read and parse the eeprom/efuse content */ /* */ -if (sizeof (pEEPROM->efuse_eeprom_data) <HWSET_MAX_SIZE_8723B ) - {} - hwinfo = pEEPROM->efuse_eeprom_data;Hal_InitPGData (padapter, hwinfo);
drivers/staging/rtl8723bs/hal/sdio_ops.c +1 -6
@@ -985,8 +985,7 @@ void sd_int_dpc(struct adapter *adapter) } }else {/* Error handling for malloc fail */ -if (rtw_cbuf_push (adapter->evtpriv.c2h_queue,NULL ) != _SUCCESS) - {} +rtw_cbuf_push (adapter->evtpriv.c2h_queue,NULL );_set_workitem (&adapter->evtpriv.c2h_wk); } }
@@ -1025,10 +1024,6 @@ void sd_int_dpc(struct adapter *adapter)if (!hisr)break ; }while (1 ); - -if (alloc_fail_time ==10 ) - {} - } }
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +6 -32
@@ -277,13 +277,9 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl {DBG_8192C ("ssid =%s, len =%d\n" , pssid->Ssid, pssid->SsidLength); -if (ssids[0 ].ssid_len ==0 ) { - } -else if (pssid->SsidLength == ssids[0 ].ssid_len && - !memcmp (pssid->Ssid, ssids[0 ].ssid, ssids[0 ].ssid_len)) - { - } -else +if (ssids[0 ].ssid_len !=0 && + (pssid->SsidLength != ssids[0 ].ssid_len || +memcmp (pssid->Ssid, ssids[0 ].ssid, ssids[0 ].ssid_len))) {if (psr !=NULL ) *psr =0 ;/* clear sr */
@@ -408,10 +404,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) {memcpy (&cur_network->network, pnetwork,sizeof (struct wlan_bssid_ex )); -if (!rtw_cfg80211_inform_bss (padapter, cur_network)) - {} -else - {} +rtw_cfg80211_inform_bss (padapter, cur_network); } else {
@@ -422,9 +415,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)if (!memcmp (&(scanned->network.Ssid), &(pnetwork->Ssid),sizeof (struct ndis_802_11_ssid )) && !memcmp (scanned->network.MacAddress, pnetwork->MacAddress,sizeof (NDIS_802_11_MAC_ADDRESS )) ) { -if (!rtw_cfg80211_inform_bss (padapter, scanned)) { - }else { - } +rtw_cfg80211_inform_bss (padapter, scanned); }else {rtw_warn_on (1 ); }
@@ -465,9 +456,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)if (!memcmp (scanned->network.MacAddress, pnetwork->MacAddress,sizeof (NDIS_802_11_MAC_ADDRESS )) && !memcmp (&(scanned->network.Ssid), &(pnetwork->Ssid),sizeof (struct ndis_802_11_ssid )) ) { -if (!rtw_cfg80211_inform_bss (padapter, scanned)) { - }else { - } +rtw_cfg80211_inform_bss (padapter, scanned); }else {rtw_warn_on (1 ); }
@@ -2413,10 +2402,6 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, strucDBG_8192C ("RTW_Tx:da =" MAC_FMT " via " FUNC_NDEV_FMT "\n" ,MAC_ARG (GetAddr1Ptr (buf)),FUNC_NDEV_ARG (ndev)); -if (category ==RTW_WLAN_CATEGORY_PUBLIC ) - {} -else - {}/* starting alloc mgmt frame to dump it */ if ((pmgntframe =alloc_mgtxmitframe (pxmitpriv)) ==NULL )
@@ -2848,10 +2833,6 @@ void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len,rtw_action_frame_parse (frame, frame_len, &category, &action);DBG_8192C ("RTW_Rx:cur_ch =%d\n" , channel); -if (msg) - {} -else - {} freq =rtw_ieee80211_channel_to_frequency (channel,NL80211_BAND_2GHZ );
@@ -2980,10 +2961,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, }DBG_8192C ("RTW_Tx:tx_ch =%d, da =" MAC_FMT "\n" , tx_ch,MAC_ARG (GetAddr1Ptr (buf))); -if (category ==RTW_WLAN_CATEGORY_PUBLIC ) - {} -else - {}rtw_ps_deny (padapter,PS_DENY_MGNT_TX );if (_FAIL ==rtw_pwr_wakeup (padapter)) {
@@ -2996,9 +2973,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, tx_ret =_cfg80211_rtw_mgmt_tx (padapter, tx_ch, buf, len); }while (dump_cnt < dump_limit && tx_ret != _SUCCESS); -if (tx_ret != _SUCCESS || dump_cnt >1 ) { - } -switch (type) {case P2P_GO_NEGO_CONF :rtw_clear_scan_deny (padapter);
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -31
@@ -400,7 +400,6 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value) padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open; } - }else if (value &WLAN_AUTH_LEAP ) { }else { ret = -EINVAL ; }
@@ -1282,7 +1281,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,spin_unlock_bh (&pmlmepriv->lock); - }else if (req->scan_type ==IW_SCAN_TYPE_PASSIVE ) { } } else if (wrqu->data.length >= WEXT_CSCAN_HEADER_SIZE
@@ -1480,9 +1478,6 @@ static int rtw_wx_set_essid(struct net_device *dev,if (wrqu->essid.flags && wrqu->essid.length) { len = (wrqu->essid.length <IW_ESSID_MAX_SIZE ) ? wrqu->essid.length :IW_ESSID_MAX_SIZE ; -if (wrqu->essid.length !=33 ) - {} -memset (&ndis_ssid,0 ,sizeof (struct ndis_802_11_ssid )); ndis_ssid.SsidLength = len;memcpy (ndis_ssid.Ssid, extra, len);
@@ -2294,9 +2289,7 @@ static int rtw_wx_set_channel_plan(struct net_device *dev,struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);u8 channel_plan_req = (u8)(*((int *)wrqu)); -if (_SUCCESS ==rtw_set_chplan_cmd (padapter, channel_plan_req,1 ,1 )) - {} -else +if (_SUCCESS !=rtw_set_chplan_cmd (padapter, channel_plan_req,1 ,1 ))return -EPERM ;return 0 ;
@@ -2450,8 +2443,6 @@ static int rtw_set_pid(struct net_device *dev,if (selector <3 && selector >=0 ) { padapter->pid[selector] = *(pdata+1 ); } -else - {} exit:
@@ -2675,11 +2666,8 @@ static int rtw_dbg_port(struct net_device *dev,for (i =0 ; i <16 ; i++) { preorder_ctrl = &psta->recvreorder_ctrl[i]; -if (preorder_ctrl->enable) - {} } - }else { }break ;case 0x06 :
@@ -2716,8 +2704,6 @@ static int rtw_dbg_port(struct net_device *dev,if (extra_arg == psta->aid) {for (j =0 ; j <16 ; j++) { preorder_ctrl = &psta->recvreorder_ctrl[j]; -if (preorder_ctrl->enable) - {} } } }
@@ -2785,9 +2771,7 @@ static int rtw_dbg_port(struct net_device *dev,/* default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */ if (extra_arg ==0 || extra_arg ==1 || extra_arg ==2 || extra_arg ==3 ) { pregpriv->rx_stbc = extra_arg; - }else - {} - + } }break ;case 0x13 :/* set ampdu_enable */
@@ -2796,9 +2780,7 @@ static int rtw_dbg_port(struct net_device *dev,/* 0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) */ if (extra_arg <3 ) { pregpriv->ampdu_enable = extra_arg; - }else - {} - + } }break ;case 0x14 :
@@ -3587,11 +3569,8 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) psta =NULL ; - }else { -/* ret = -1; */ } -return ret; }
@@ -3687,7 +3666,6 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) param->u.wpa_ie.len = copy_len;memcpy (param->u.wpa_ie.reserved, psta->wpa_ie, copy_len); - }else { } }else { ret =-1 ;
@@ -3826,16 +3804,10 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,memcpy (ssid, ssid_ie+2 , ssid_len); ssid[ssid_len] =0x0 ; -if (0 ) - {} -memcpy (pbss_network->Ssid.Ssid, (void *)ssid, ssid_len); pbss_network->Ssid.SsidLength = ssid_len;memcpy (pbss_network_ext->Ssid.Ssid, (void *)ssid, ssid_len); pbss_network_ext->Ssid.SsidLength = ssid_len; - -if (0 ) - {} }return ret;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -2
@@ -1678,8 +1678,6 @@ static int rtw_resume_process_normal(struct adapter *padapter) }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {rtw_ap_restore_network (padapter); - }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { - }else { } exit:
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +0 -20
@@ -52,8 +52,6 @@ u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) v =sdio_f0_readb (func, addr, err);if (claim_needed)sdio_release_host (func); -if (err && *err) - {}return v; }
@@ -217,8 +215,6 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) v =sdio_readb (func, addr, err);if (claim_needed)sdio_release_host (func); -if (err && *err) - {}return v; }
@@ -272,12 +268,6 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err) } } } - -if (i ==SD_IO_TRY_CNT ) - {} -else - {} - }return v; }
@@ -306,8 +296,6 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err)sdio_writeb (func, v, addr, err);if (claim_needed)sdio_release_host (func); -if (err && *err) - {} }void sd_write32 (struct intf_hdl *pintfhdl,u32 addr,u32 v,s32 *err)
@@ -359,10 +347,6 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err) } } -if (i ==SD_IO_TRY_CNT ) - {} -else - {} } }
@@ -415,8 +399,6 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) } err =sdio_memcpy_fromio (func, pdata, addr, cnt); -if (err) - {}return err; }
@@ -514,8 +496,6 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) size = cnt; err =sdio_memcpy_toio (func, addr, pdata, size); -if (err) - {}return err; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/10 staging: rtl8723bs: remove empty #ifdef blocks after DBG_871X removal
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit b4f27a06f6382b9d6f9f5cd8a6445b0af001a2a6 ]
remove #ifdef and blocks #if defined() blocks left empty after DBG_871X removal.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 7 -- drivers/staging/rtl8723bs/core/rtw_mlme.c | 14 ---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 ----- drivers/staging/rtl8723bs/core/rtw_recv.c | 76 ------------------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 - drivers/staging/rtl8723bs/core/rtw_xmit.c | 20 ----- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 - .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 16 ---- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 18 ----- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 4 - 10 files changed, 177 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +0 -7
@@ -180,9 +180,6 @@ static void update_BCNTIM(struct adapter *padapter)u8 chk_sta_is_alive (struct sta_info *psta);u8 chk_sta_is_alive (struct sta_info *psta) { -#ifdef DBG_EXPIRATION_CHK -#endif -sta_update_last_rx_pkts (psta);return true;
@@ -204,8 +201,6 @@ void expire_timeout_chk(struct adapter *padapter) plist =get_next (phead);/* check auth_queue */ -#ifdef DBG_EXPIRATION_CHK -#endif while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, auth_list);
@@ -235,8 +230,6 @@ void expire_timeout_chk(struct adapter *padapter) plist =get_next (phead);/* check asoc_queue */ -#ifdef DBG_EXPIRATION_CHK -#endif while (phead != plist) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist =get_next (plist);
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -14
@@ -491,11 +491,6 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,u8 sq_final;long rssi_final; -#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &&1 -if (strcmp (dst->Ssid.Ssid,DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) ==0 ) { - } -#endif -/* The rule below is 1/5 for sample value, 4/5 for history value */ if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&(padapter->mlmepriv.cur_network.network), src,0 )) {/* Take the recvpriv's value for the connected AP*/
@@ -529,9 +524,6 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, dst->PhyInfo.SignalStrength = ss_final; dst->PhyInfo.SignalQuality = sq_final; dst->Rssi = rssi_final; - -#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &&1 -#endif }static void update_current_network (struct adapter *adapter,struct wlan_bssid_ex *pnetwork)
@@ -1163,8 +1155,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl = &psta->recvreorder_ctrl[i]; preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; -#ifdef DBG_RX_SEQ -#endif preorder_ctrl->wend_b =0xffff ; preorder_ctrl->wsize_b =64 ;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ }
@@ -1176,8 +1166,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; -#ifdef DBG_RX_SEQ -#endif preorder_ctrl->wend_b =0xffff ; preorder_ctrl->wsize_b =64 ;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ }
@@ -1214,8 +1202,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality;/* the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled) */ padapter->recvpriv.rssi =translate_percentage_to_dbm (ptarget_wlan->network.PhyInfo.SignalStrength); -#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING ) &&1 -#endif rtw_set_signal_stat_timer (&padapter->recvpriv);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -18
@@ -1932,8 +1932,6 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra preorder_ctrl = &psta->recvreorder_ctrl[tid]; preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; -#ifdef DBG_RX_SEQ -#endif }/* todo: how to notify the host while receiving DELETE BA */ break ;
@@ -4046,8 +4044,6 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)issue_action_BA (padapter, addr,RTW_WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); psta->recvreorder_ctrl[tid].enable = false; psta->recvreorder_ctrl[tid].indicate_seq =0xffff ; -#ifdef DBG_RX_SEQ -#endif } } }else if (initiator ==1 ) {/* originator */
@@ -4121,10 +4117,6 @@ void site_survey(struct adapter *padapter) } } -#ifdef DBG_FIXED_CHAN - -#endif -if (survey_channel !=0 ) {/* PAUSE 4-AC Queue when site_survey */ /* rtw_hal_get_hwreg(padapter, HW_VAR_TXPAUSE, (u8 *)(&val8)); */
@@ -4384,9 +4376,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str pmlmepriv->num_sta_no_ht++; } -#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &1 -#endif -/* mark bss info receiving from nearby channel as SignalQuality 101 */ if (bssid->Configuration.DSConfig !=rtw_get_oper_ch (padapter)) bssid->PhyInfo.SignalQuality =101 ;
@@ -5413,9 +5402,6 @@ static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta) {u8 ret = false; -#ifdef DBG_EXPIRATION_CHK -#endif -if ((sta_rx_data_pkts (psta) ==sta_last_rx_data_pkts (psta)) &&sta_rx_beacon_pkts (psta) ==sta_last_rx_beacon_pkts (psta) && sta_rx_probersp_pkts(psta) == sta_last_rx_probersp_pkts(psta)
@@ -5468,8 +5454,6 @@ void linked_status_chk(struct adapter *padapter) {if (rx_chk != _SUCCESS) {if (pmlmeext->retry ==0 ) { -#ifdef DBG_EXPIRATION_CHK -#endif issue_probereq_ex (padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress,0 ,0 ,0 ,0 );issue_probereq_ex (padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress,0 ,0 ,0 ,0 );issue_probereq_ex (padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress,0 ,0 ,0 ,0 );
@@ -5477,8 +5461,6 @@ void linked_status_chk(struct adapter *padapter) }if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == link_count_limit) { -#ifdef DBG_EXPIRATION_CHK -#endif tx_chk =issue_nulldata_in_interrupt (padapter,NULL ); } }
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -76
274 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +0 -2
@@ -264,8 +264,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; -#ifdef DBG_RX_SEQ -#endif preorder_ctrl->wend_b =0xffff ;/* preorder_ctrl->wsize_b = (NR_RECVBUFF-2); */ preorder_ctrl->wsize_b =64 ;/* 64; */
drivers/staging/rtl8723bs/core/rtw_xmit.c +0 -20
@@ -495,8 +495,6 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pif ((pattrib->ether_type !=0x888e ) && (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false)) {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n" , pattrib->ether_type)); -#ifdef DBG_TX_DROP_FRAME -#endif res = _FAIL; goto exit; }
@@ -538,8 +536,6 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p pattrib->icv_len =4 ;if (psecuritypriv->busetkipkey == _FAIL) { -#ifdef DBG_TX_DROP_FRAME -#endif res = _FAIL; goto exit; }
@@ -738,8 +734,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attribif (!psta) {/* if we cannot get psta => drop the pkt */ DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_err_ucast_sta);RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n" ,MAC_ARG (pattrib->ra))); -#ifdef DBG_TX_DROP_FRAME -#endif res = _FAIL; goto exit; }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && (!(psta->state & _FW_LINKED))) {
@@ -753,8 +747,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib/* if we cannot get psta => drop the pkt */ DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_err_sta);RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n" ,MAC_ARG (pattrib->ra))); -#ifdef DBG_TX_DROP_FRAME -#endif res = _FAIL; goto exit; }
@@ -1552,8 +1544,6 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)if (pxmitbuf) { pxmitpriv->free_xmit_extbuf_cnt--; -#ifdef DBG_XMIT_BUF_EXT -#endif pxmitbuf->priv_data =NULL ;
@@ -1585,8 +1575,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_add_tail (&pxmitbuf->list,get_list_head (pfree_queue)); pxmitpriv->free_xmit_extbuf_cnt++; -#ifdef DBG_XMIT_BUF_EXT -#endif spin_unlock_irqrestore (&pfree_queue->lock, irqL);
@@ -1616,8 +1604,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)if (pxmitbuf) { pxmitpriv->free_xmitbuf_cnt--; -#ifdef DBG_XMIT_BUF -#endif pxmitbuf->priv_data =NULL ;
@@ -1630,8 +1616,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)rtw_sctx_done_err (&pxmitbuf->sctx,RTW_SCTX_DONE_BUF_ALLOC ); } } -#ifdef DBG_XMIT_BUF -#endif spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irqL);
@@ -1662,8 +1646,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) get_list_head(pfree_xmitbuf_queue)); pxmitpriv->free_xmitbuf_cnt++; -#ifdef DBG_XMIT_BUF -#endif spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irqL); }return _SUCCESS;
@@ -2099,8 +2081,6 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)if (res == _FAIL) {RT_TRACE (_module_xmit_osdep_c_, _drv_err_, ("%s: update attrib fail\n" , __func__)); -#ifdef DBG_TX_DROP_FRAME -#endif rtw_free_xmitframe (pxmitpriv, pxmitframe);return -1 ; }
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -2
@@ -251,8 +251,6 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv ptxservq = LIST_CONTAINOR(sta_plist, struct tx_servq, tx_pending); sta_plist =get_next (sta_plist); -#ifdef DBG_XMIT_BUF -#endif pframe_queue = &ptxservq->sta_pending; frame_phead =get_list_head (pframe_queue);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -16
@@ -1170,9 +1170,6 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, goto exit; } -#ifdef DEBUG_CFG80211 -#endif -/* for infra./P2PClient mode */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) && check_fwstate(pmlmepriv, _FW_LINKED)
@@ -1293,9 +1290,6 @@ void rtw_cfg80211_indicate_scan_done(struct adapter *adapter, bool aborted)spin_lock_bh (&pwdev_priv->scan_req_lock);if (pwdev_priv->scan_request !=NULL ) { -#ifdef DEBUG_CFG80211 -#endif -/* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */ if (pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy) {
@@ -1308,8 +1302,6 @@ void rtw_cfg80211_indicate_scan_done(struct adapter *adapter, bool aborted) pwdev_priv->scan_request =NULL ; }else { -#ifdef DEBUG_CFG80211 -#endif }spin_unlock_bh (&pwdev_priv->scan_req_lock); }
@@ -1450,9 +1442,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphyif (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { -#ifdef DEBUG_CFG80211 -#endif -if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS |_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) {DBG_8192C ("%s, fwstate = 0x%x\n" , __func__, pmlmepriv->fw_state);
@@ -1526,8 +1515,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy/* parsing channels, n_channels */ memset (ch,0 ,sizeof (struct rtw_ieee80211_channel )*RTW_CHANNEL_SCAN_AMOUNT );for (i =0 ; i < request->n_channels && i <RTW_CHANNEL_SCAN_AMOUNT ; i++) { -#ifdef DEBUG_CFG80211 -#endif ch[i].hw_value = request->channels[i]->hw_value; ch[i].flags = request->channels[i]->flags; }
@@ -2948,9 +2935,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,/* cookie generation */ *cookie = (unsigned long ) buf; -#ifdef DEBUG_CFG80211 -#endif /* DEBUG_CFG80211 */ -/* indicate ack before issue frame to avoid racing with rsp frame */ rtw_cfg80211_mgmt_tx_status (padapter, *cookie, buf, len, ack,GFP_KERNEL );
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0 -18
@@ -1227,9 +1227,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT ];RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n" )); -#ifdef DBG_IOCTL -#endif -rtw_ps_deny (padapter,PS_DENY_SCAN );if (_FAIL ==rtw_pwr_wakeup (padapter)) { ret =-1 ;
@@ -1349,9 +1346,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,rtw_ps_deny_cancel (padapter,PS_DENY_SCAN ); -#ifdef DBG_IOCTL -#endif -return ret; }
@@ -1371,9 +1365,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_scan\n" ));RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, (" Start of Query SIOCGIWSCAN .\n" )); -#ifdef DBG_IOCTL -#endif -if (adapter_to_pwrctl (padapter)->brfoffbyhw && padapter->bDriverStopped) { ret = -EINVAL ; goto exit;
@@ -1419,9 +1410,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, exit: -#ifdef DBG_IOCTL -#endif -return ret; }
@@ -1446,9 +1434,6 @@ static int rtw_wx_set_essid(struct net_device *dev,uint ret =0 , len; -#ifdef DBG_IOCTL -#endif -RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, ("+rtw_wx_set_essid: fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)));
@@ -1540,9 +1525,6 @@ static int rtw_wx_set_essid(struct net_device *dev,rtw_ps_deny_cancel (padapter,PS_DENY_JOIN ); -#ifdef DBG_IOCTL -#endif -return ret; }
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +0 -4
@@ -209,8 +209,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)if (rtw_if_up (padapter) == false) {DBG_COUNTER (padapter->tx_logs.os_tx_err_up);RT_TRACE (_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n" )); -#ifdef DBG_TX_DROP_FRAME -#endif goto drop_packet; }
@@ -236,8 +234,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) res =rtw_xmit (padapter, &pkt);if (res <0 ) { -#ifdef DBG_TX_DROP_FRAME -#endif goto drop_packet; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/10 staging: rtl8723bs: remove unnecessary bracks on DBG_871X removal sites
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit 709c8e49b51c3702417941ac5f45ae12e4e405ce ]
remove unnecessary bracks on DBG_871X removal sites
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 9 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 6 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 10 +-- drivers/staging/rtl8723bs/core/rtw_io.c | 3 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 32 +++----- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 77 ++++++----------- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 57 +++++-------- drivers/staging/rtl8723bs/core/rtw_recv.c | 19 ++--- drivers/staging/rtl8723bs/core/rtw_security.c | 12 +-- .../staging/rtl8723bs/core/rtw_wlan_util.c | 82 ++++++++----------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 49 +++++------ drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 4 +- drivers/staging/rtl8723bs/hal/hal_com.c | 6 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 69 ++++++---------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 +-- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 +- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 3 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 6 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 17 ++-- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 57 +++++-------- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 15 ++-- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 3 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 9 +- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 52 ++++-------- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 +- 29 files changed, 242 insertions(+), 408 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -6
@@ -286,9 +286,8 @@ void expire_timeout_chk(struct adapter *padapter) && padapter->xmitpriv.free_xmitframe_cnt < (( NR_XMITFRAME / pstapriv->asoc_list_cnt ) / 2) - ) { + )wakeup_sta_to_xmit (padapter, psta); - } } }
@@ -550,15 +549,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* B0 Config LDPC Coding Capability */ if (TEST_FLAG (phtpriv_ap->ldpc_cap,LDPC_HT_ENABLE_TX ) && -GET_HT_CAPABILITY_ELE_LDPC_CAP ((u8 *)(&phtpriv_sta->ht_cap))) { +GET_HT_CAPABILITY_ELE_LDPC_CAP ((u8 *)(&phtpriv_sta->ht_cap)))SET_FLAG (cur_ldpc_cap, (LDPC_HT_ENABLE_TX |LDPC_HT_CAP_TX )); - }/* B7 B8 B9 Config STBC setting */ if (TEST_FLAG (phtpriv_ap->stbc_cap,STBC_HT_ENABLE_TX ) && -GET_HT_CAPABILITY_ELE_RX_STBC ((u8 *)(&phtpriv_sta->ht_cap))) { +GET_HT_CAPABILITY_ELE_RX_STBC ((u8 *)(&phtpriv_sta->ht_cap)))SET_FLAG (cur_stbc_cap, (STBC_HT_ENABLE_TX |STBC_HT_CAP_TX )); - } }else { phtpriv_sta->ampdu_enable = false;
drivers/staging/rtl8723bs/core/rtw_btcoex.c +2 -4
@@ -21,13 +21,11 @@ void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)void rtw_btcoex_HaltNotify (struct adapter *padapter) { -if (!padapter->bup) { +if (!padapter->bup)return ; - } -if (padapter->bSurpriseRemoved) { +if (padapter->bSurpriseRemoved)return ; - }hal_btcoex_HaltNotify (padapter); }
drivers/staging/rtl8723bs/core/rtw_cmd.c +4 -6
@@ -316,9 +316,9 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)if ((pcmdpriv->padapter->hw_init_completed == false && bAllow == false) ||atomic_read (&(pcmdpriv->cmdthd_running)) == false/* com_thread not running */ - ) { + )return _FAIL; - } +return _SUCCESS; }
@@ -425,9 +425,8 @@ int rtw_cmd_thread(void *context)break ; } -if (list_empty (&(pcmdpriv->cmd_queue.queue))) { +if (list_empty (&(pcmdpriv->cmd_queue.queue)))continue ; - }if (rtw_register_cmd_alive (padapter) != _SUCCESS) { RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
@@ -1546,9 +1545,8 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)mutex_lock (&pwrpriv->lock); -if (pwrpriv->dtim != dtim) { +if (pwrpriv->dtim != dtim) pwrpriv->dtim = dtim; - }if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) {u8 ps_mode = pwrpriv->pwr_mode;
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +4 -6
@@ -869,9 +869,8 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,/* first 3 bytes in vendor specific information element are the IEEE * OUI of the vendor. The following byte is used a vendor specific * sub-type. */ -if (elen <4 ) { +if (elen <4 )return -1 ; - } oui =get_unaligned_be24 (pos);switch (oui) {
@@ -886,9 +885,9 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen, elems->wpa_ie_len = elen;break ;case WME_OUI_TYPE :/* this is a Wi-Fi WME info. element */ -if (elen <5 ) { +if (elen <5 )return -1 ; - } +switch (pos[4 ]) {case WME_OUI_SUBTYPE_INFORMATION_ELEMENT :case WME_OUI_SUBTYPE_PARAMETER_ELEMENT :
@@ -956,9 +955,8 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, elen = *pos++; left -=2 ; -if (elen > left) { +if (elen > left)return ParseFailed; - }switch (id) {case WLAN_EID_SSID :
drivers/staging/rtl8723bs/core/rtw_io.c +1 -2
@@ -172,9 +172,8 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj) {int ret = false;int value =atomic_inc_return (&dvobj->continual_io_error); -if (value >MAX_CONTINUAL_IO_ERR ) { +if (value >MAX_CONTINUAL_IO_ERR ) ret = true; - }return ret; }
drivers/staging/rtl8723bs/core/rtw_mlme.c +12 -20
@@ -724,9 +724,8 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor } } -if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy ==0 )) { +if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy ==0 )) bselected = false; - }if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) {if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode)
@@ -1082,9 +1081,9 @@ void rtw_scan_abort(struct adapter *adapter)msleep (20 ); } -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) { +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY))rtw_indicate_scan_done (adapter, true); - } + pmlmeext->scan_abort = false; }
@@ -1734,13 +1733,11 @@ static void rtw_auto_scan_handler(struct adapter *padapter) && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) { -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) goto exit; - } -if (pmlmepriv->LinkDetectInfo.bBusyTraffic) { +if (pmlmepriv->LinkDetectInfo.bBusyTraffic) goto exit; - } }rtw_set_802_11_bssid_list_scan (padapter,NULL ,0 );
@@ -2439,12 +2436,11 @@ void rtw_ht_use_default_setting(struct adapter *padapter)rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMER , (u8 *)&bHwSupportBeamformer);rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMEE , (u8 *)&bHwSupportBeamformee);CLEAR_FLAGS (phtpriv->beamform_cap); -if (TEST_FLAG (pregistrypriv->beamform_cap,BIT4 ) && bHwSupportBeamformer) { +if (TEST_FLAG (pregistrypriv->beamform_cap,BIT4 ) && bHwSupportBeamformer)SET_FLAG (phtpriv->beamform_cap,BEAMFORMING_HT_BEAMFORMER_ENABLE ); - } -if (TEST_FLAG (pregistrypriv->beamform_cap,BIT5 ) && bHwSupportBeamformee) { + +if (TEST_FLAG (pregistrypriv->beamform_cap,BIT5 ) && bHwSupportBeamformee)SET_FLAG (phtpriv->beamform_cap,BEAMFORMING_HT_BEAMFORMEE_ENABLE ); - } }void rtw_build_wmm_ie_ht (struct adapter *padapter,u8 *out_ie,uint *pout_len)
@@ -2539,9 +2535,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (TEST_FLAG (phtpriv->stbc_cap,STBC_HT_ENABLE_RX )) {if ((channel <=14 && pregistrypriv->rx_stbc ==0x1 ) ||/* enable for 2.4GHz */ - (pregistrypriv->wifi_spec ==1 )) { + (pregistrypriv->wifi_spec ==1 )) stbc_rx_enable =1 ; - } }/* fill default supported_mcs_set */
@@ -2746,17 +2741,14 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr priority = pattrib->priority; psta =rtw_get_stainfo (&padapter->stapriv, pattrib->ra); -if (pattrib->psta != psta) { +if (pattrib->psta != psta)return ; - } -if (!psta) { +if (!psta)return ; - } -if (!(psta->state & _FW_LINKED)) { +if (!(psta->state & _FW_LINKED))return ; - } phtpriv = &psta->htpriv;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +27 -50
227 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +21 -36
152 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +7 -12
@@ -874,9 +874,8 @@ sint ap2sta_data_frame( (" ap2sta_data_frame: compare BSSID fail ; BSSID ="MAC_FMT"\n", MAC_ARG(pattrib->bssid)));RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("mybssid =" MAC_FMT "\n" ,MAC_ARG (mybssid))); -if (!bmcast) { +if (!bmcast)issue_deauth (adapter, pattrib->bssid,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA ); - } ret = _FAIL; goto exit;
@@ -1806,14 +1805,12 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)/* Offset 12 denote 2 mac address */ nSubframe_Length =get_unaligned_be16 (pdata +12 ); -if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) { +if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length))break ; - } sub_pkt =rtw_os_alloc_msdu_pkt (prframe, nSubframe_Length, pdata); -if (!sub_pkt) { +if (!sub_pkt)break ; - }/* move the data point to data content */ pdata +=ETH_HLEN ;
@@ -1821,9 +1818,8 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) subframes[nr_subframes++] = sub_pkt; -if (nr_subframes >=MAX_SUBFRAME_COUNT ) { +if (nr_subframes >=MAX_SUBFRAME_COUNT )break ; - } pdata += nSubframe_Length; a_len -= nSubframe_Length;
@@ -1833,9 +1829,9 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) padding_len =0 ; } -if (a_len < padding_len) { +if (a_len < padding_len)break ; - } + pdata += padding_len; a_len -= padding_len; }
@@ -2024,9 +2020,8 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr plist =get_next (plist);list_del_init (&(prframe->u.hdr.list)); -if (SN_EQUAL (preorder_ctrl->indicate_seq, pattrib->seq_num)) { +if (SN_EQUAL (preorder_ctrl->indicate_seq, pattrib->seq_num)) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq +1 ) &0xFFF ; - }/* Set this as a lock to make sure that only one thread is indicating packet. */ /* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */
drivers/staging/rtl8723bs/core/rtw_security.c +6 -6
@@ -1887,9 +1887,9 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe) ori_len = pattrib->pkt_len-WLAN_HDR_A3_LEN +BIP_AAD_SIZE ;BIP_AAD =rtw_zmalloc (ori_len); -if (BIP_AAD ==NULL ) { +if (BIP_AAD ==NULL )return _FAIL; - } +/* PKT start */ pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;/* mapping to wlan header */
@@ -1906,15 +1906,15 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)memcpy (&le_tmp64, p+4 ,6 ); temp_ipn =le64_to_cpu (le_tmp64);/* BIP packet number should bigger than previous BIP packet */ -if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx) { +if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx) goto BIP_exit; - } +/* copy key index */ memcpy (&le_tmp, p+2 ,2 ); keyid =le16_to_cpu (le_tmp); -if (keyid != padapter->securitypriv.dot11wBIPKeyid) { +if (keyid != padapter->securitypriv.dot11wBIPKeyid) goto BIP_exit; - } +/* clear the MIC field of MME to zero */ memset (p+2 +len-8 ,0 ,8 );
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +33 -49
181 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_xmit.c +19 -30
127 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c +2 -2
@@ -147,9 +147,9 @@ u8 HalPwrSeqCmdParsing(else udelay (10 ); -if (pollingCount++ > maxPollingCnt) { +if (pollingCount++ > maxPollingCnt)return false; - } + }while (!bPollingBit);break ;
drivers/staging/rtl8723bs/hal/hal_com.c +2 -4
@@ -151,9 +151,8 @@ bool HAL_IsLegalChannel(struct adapter *Adapter, u32 Channel)bool bLegalChannel = true;if ((Channel <=14 ) && (Channel >=1 )) { -if (IsSupported24G (Adapter->registrypriv.wireless_mode) == false) { +if (IsSupported24G (Adapter->registrypriv.wireless_mode) == false) bLegalChannel = false; - } }else { bLegalChannel = false; }
@@ -1375,9 +1374,8 @@ bool GetHexValueFromString(char *szStr, u32 *pu4bVal, u32 *pu4bMove)char *szScan = szStr;/* Check input parameter. */ -if (!szStr || !pu4bVal || !pu4bMove) { +if (!szStr || !pu4bVal || !pu4bMove)return false; - }/* Initialize output. */ *pu4bMove =0 ;
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +27 -42
158 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +4 -8
@@ -201,9 +201,8 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) _ConstructBeacon: -if ((pktlen +TXDESC_SIZE ) >512 ) { +if ((pktlen +TXDESC_SIZE ) >512 )return ; - } *pLength = pktlen;
@@ -1062,13 +1061,11 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode) ratio_20_delay += pmlmeext->bcn_delay_ratio[i]; ratio_80_delay += pmlmeext->bcn_delay_ratio[i]; -if (ratio_20_delay >20 && pmlmeext->DrvBcnEarly ==0xff ) { +if (ratio_20_delay >20 && pmlmeext->DrvBcnEarly ==0xff ) pmlmeext->DrvBcnEarly = i; - } -if (ratio_80_delay >80 && pmlmeext->DrvBcnTimeOut ==0xff ) { +if (ratio_80_delay >80 && pmlmeext->DrvBcnTimeOut ==0xff ) pmlmeext->DrvBcnTimeOut = i; - }/* reset adaptive_early_32k cnt */ pmlmeext->bcn_delay_cnt[i] =0 ;
@@ -1416,9 +1413,8 @@ static void rtl8723b_set_FwRsvdPagePkt( MaxRsvdPageBufSize = RsvdPageNum*PageSize; pcmdframe =rtw_alloc_cmdxmitframe (pxmitpriv); -if (!pcmdframe) { +if (!pcmdframe)return ; - } ReservedPagePacket = pcmdframe->buf_addr;memset (&RsvdPageLoc,0 ,sizeof (RSVDPAGE_LOC ));
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -5
@@ -367,9 +367,8 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw)/* 2. read power_state = 0xA0[1:0] */ tmp_ps =rtw_read8 (padapter,0xa0 ); tmp_ps &=0x03 ; -if (tmp_ps !=0x01 ) { +if (tmp_ps !=0x01 ) pdbgpriv->dbg_downloadfw_pwr_state_cnt++; - }#ifdef CONFIG_WOWLAN if (bUsedWoWLANFw)
@@ -2069,11 +2068,10 @@ static void rtl8723b_SetHalODMVar(static void hal_notch_filter_8723b (struct adapter *adapter,bool enable) { -if (enable) { +if (enable)rtw_write8 (adapter, rOFDM0_RxDSP+1 ,rtw_read8 (adapter, rOFDM0_RxDSP+1 ) |BIT1 ); - }else { +else rtw_write8 (adapter, rOFDM0_RxDSP+1 ,rtw_read8 (adapter, rOFDM0_RxDSP+1 ) & ~BIT1 ); - } }static void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level)
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +1 -2
@@ -879,9 +879,8 @@ static void PHY_HandleSwChnlAndSetBW8723B(/* DBG_871X("=> PHY_HandleSwChnlAndSetBW8812: bSwitchChannel %d, bSetBandWidth %d\n", bSwitchChannel, bSetBandWidth); */ /* check is swchnl or setbw */ -if (!bSwitchChannel && !bSetBandWidth) { +if (!bSwitchChannel && !bSetBandWidth)return ; - }/* skip change for channel or bandwidth is the same */ if (bSwitchChannel) {
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -6
@@ -19,9 +19,8 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)if ( (padapter->bSurpriseRemoved) || (padapter->bDriverStopped) - ) { + )return false; - }HalQueryTxOQTBufferStatus8723BSdio (padapter);
@@ -296,14 +295,12 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv }/* ok to send, remove frame from queue */ -if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) { +if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true)if ( (pxmitframe->attrib.psta->state &WIFI_SLEEP_STATE ) && (pxmitframe->attrib.triggered ==0 ) - ) { + )break ; - } - }list_del_init (&pxmitframe->list); ptxservq->qcnt--;
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -2
@@ -732,9 +732,9 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)if ((cpwm_orig ^ cpwm_now) &0x80 )break ; -if (jiffies_to_msecs (jiffies - start_time) >100 ) { +if (jiffies_to_msecs (jiffies - start_time) >100 )break ; - } + }while (1 );rtl8723b_set_FwPwrModeInIPS_cmd (padapter,0 );
drivers/staging/rtl8723bs/hal/sdio_ops.c +2 -4
@@ -469,9 +469,8 @@ static u32 sdio_write_port( adapter = intfhdl->padapter; psdio = &adapter_to_dvobj (adapter)->intf_data; -if (!adapter->hw_init_completed) { +if (!adapter->hw_init_completed)return _FAIL; - } cnt =round_up (cnt,4 );HalSdioGetCmdAddr8723BSdio (adapter, addr, cnt >>2 , &addr);
@@ -876,9 +875,8 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)skb_reserve (recvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); } -if (!recvbuf->pskb) { +if (!recvbuf->pskb)return NULL ; - } }/* 3 3. read data from rxfifo */
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +5 -12
@@ -239,9 +239,8 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl/* DBG_8192C("%s\n", __func__); */ bssinf_len = pnetwork->network.IELength +sizeof (struct ieee80211_hdr_3addr ); -if (bssinf_len >MAX_BSSINFO_LEN ) { +if (bssinf_len >MAX_BSSINFO_LEN ) goto exit; - } {u16 wapi_len =0 ;
@@ -249,9 +248,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlif (rtw_get_wapi_ie (pnetwork->network.IEs, pnetwork->network.IELength,NULL , &wapi_len) >0 ) {if (wapi_len >0 ) - { goto exit; - } } }
@@ -414,11 +411,10 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) }if (!memcmp (&(scanned->network.Ssid), &(pnetwork->Ssid),sizeof (struct ndis_802_11_ssid )) && !memcmp (scanned->network.MacAddress, pnetwork->MacAddress,sizeof (NDIS_802_11_MAC_ADDRESS )) - ) { + )rtw_cfg80211_inform_bss (padapter, scanned); - }else { +else rtw_warn_on (1 ); - } }if (!rtw_cfg80211_check_bss (padapter))
@@ -455,11 +451,10 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)if (!memcmp (scanned->network.MacAddress, pnetwork->MacAddress,sizeof (NDIS_802_11_MAC_ADDRESS )) && !memcmp (&(scanned->network.Ssid), &(pnetwork->Ssid),sizeof (struct ndis_802_11_ssid )) - ) { + )rtw_cfg80211_inform_bss (padapter, scanned); - }else { +else rtw_warn_on (1 ); - } } check_bss:
@@ -2248,9 +2243,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, }if (false == bMatched) - {return -EINVAL ; - }return 0 ; }
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +21 -36
168 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2 -2
@@ -151,9 +151,9 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX ); -if (NULL == buff) { +if (NULL == buff)return ; - } + p = buff; p +=sprintf (p,"ASSOCINFO(ReqIEs =" );
drivers/staging/rtl8723bs/os_dep/os_intfs.c +5 -10
@@ -905,9 +905,8 @@ int _netdev_open(struct net_device *pnetdev) } status =rtw_start_drv_threads (padapter); -if (status == _FAIL) { +if (status == _FAIL) goto netdev_open_error; - }if (padapter->intf_start) padapter->intf_start (padapter);
@@ -950,9 +949,8 @@ int netdev_open(struct net_device *pnetdev)struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct pwrctrl_priv *pwrctrlpriv =adapter_to_pwrctl (padapter); -if (pwrctrlpriv->bInSuspend) { +if (pwrctrlpriv->bInSuspend)return 0 ; - }if (mutex_lock_interruptible (&(adapter_to_dvobj (padapter)->hw_init_mutex)))return -1 ;
@@ -1384,11 +1382,10 @@ int rtw_suspend_common(struct adapter *padapter)rtw_stop_cmd_thread (padapter);/* wait for the latest FW to remove this condition. */ -if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))hal_btcoex_SuspendNotify (padapter,0 ); - }else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { +else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ))hal_btcoex_SuspendNotify (padapter,1 ); - }rtw_ps_deny_cancel (padapter,PS_DENY_SUSPEND );
@@ -1668,14 +1665,12 @@ static int rtw_resume_process_normal(struct adapter *padapter)netif_device_attach (pnetdev);netif_carrier_on (pnetdev); -if (padapter->pid[1 ] !=0 ) { +if (padapter->pid[1 ] !=0 )rtw_signal_process (padapter->pid[1 ],SIGUSR2 ); - }if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (rtw_chk_roam_flags (padapter,RTW_ROAM_ON_RESUME ))rtw_roaming (padapter,NULL ); - }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {rtw_ap_restore_network (padapter); }
drivers/staging/rtl8723bs/os_dep/recv_linux.c +1 -2
@@ -62,9 +62,8 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 pattrib = &prframe->u.hdr.attrib; sub_skb =rtw_skb_alloc (nSubframe_Length +12 ); -if (!sub_skb) { +if (!sub_skb)return NULL ; - }skb_reserve (sub_skb,12 );skb_put_data (sub_skb, (pdata +ETH_HLEN ), nSubframe_Length);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +3 -6
@@ -58,9 +58,8 @@ static void sd_sync_int_hdl(struct sdio_func *func) psdpriv =sdio_get_drvdata (func); -if (!psdpriv->if1) { +if (!psdpriv->if1)return ; - }rtw_sdio_set_irq_thd (psdpriv, current);sd_int_hdl (psdpriv->if1);
@@ -460,9 +459,8 @@ static int rtw_drv_init( } if1 =rtw_sdio_if1_init (dvobj, id); -if (if1 ==NULL ) { +if (if1 ==NULL ) goto free_dvobj; - }/* dev_alloc_name && register_netdev */ status =rtw_drv_register_netdev (if1);
@@ -544,9 +542,8 @@ static int rtw_sdio_suspend(struct device *dev)struct adapter *padapter = psdpriv->if1;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; -if (padapter->bDriverStopped) { +if (padapter->bDriverStopped)return 0 ; - }if (pwrpriv->bInSuspend) { pdbgpriv->dbg_suspend_error_cnt++;
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +18 -34
169 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +2 -4
@@ -112,9 +112,8 @@ static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt) queue =skb_get_queue_mapping (pkt);if (padapter->registrypriv.wifi_spec) {/* No free space for Tx, tx_worker is too slow */ -if (pxmitpriv->hwxmits[queue].accnt >WMM_XMIT_THRESHOLD ) { +if (pxmitpriv->hwxmits[queue].accnt >WMM_XMIT_THRESHOLD )netif_stop_subqueue (padapter->pnetdev, queue); - } }else {if (pxmitpriv->free_xmitframe_cnt <=4 ) {if (!netif_tx_queue_stopped (netdev_get_tx_queue (padapter->pnetdev, queue)))
@@ -233,9 +232,8 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) } res =rtw_xmit (padapter, &pkt); -if (res <0 ) { +if (res <0 ) goto drop_packet; - }RT_TRACE (_module_xmit_osdep_c_, _drv_info_, ("rtw_xmit_entry: tx_pkts =%d\n" , (u32 )pxmitpriv->tx_pkts)); goto exit;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 7/10 staging: rtl8723bs: refactor to reduce indents
In reply to Sasha LevinFrom: Shreyansh Chouhan <[email protected]>
[ Upstream commit 3c8c577fd2fcf3587f16a2a9e8174c9f849cb7a6 ]
Reduce the number of indents in rtw_wlan_util.c file by refactoring the code.
Moved the part of code that rearranged ac paramaters in the function WMMOnAssocResp to a separate function named sort_wmm_ac_params. It takes both the array of ac params and their indexes as arguments and sorts them. Has return type void.
Moved the part of code that checked IE for realtek vendor in the function check_assoc_AP to a separate function named get_realtek_assoc_AP_vender. It takes a struct ndis_80211_var_ie * as an argument and returns u32 realtek vendor.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 108 +++++++++--------- 1 file changed, 56 insertions(+), 52 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +56 -52
@@ -775,6 +775,32 @@ int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)return true; } +static void sort_wmm_ac_params (u32 *inx,u32 *edca) +{ +u32 i, j, change_inx = false; + +/* entry indx: 0->vo, 1->vi, 2->be, 3->bk. */ +for (i =0 ; i <4 ; i++) { +for (j = i +1 ; j <4 ; j++) { +/* compare CW and AIFS */ +if ((edca[j] &0xFFFF ) < (edca[i] &0xFFFF )) { + change_inx = true; + }else if ((edca[j] &0xFFFF ) == (edca[i] &0xFFFF )) { +/* compare TXOP */ +if ((edca[j] >>16 ) > (edca[i] >>16 )) + change_inx = true; + } + +if (change_inx) { +swap (edca[i], edca[j]); +swap (inx[i], inx[j]); + + change_inx = false; + } + } + } +} +void WMMOnAssocRsp (struct adapter *padapter) {u8 ACI ,ACM ,AIFS , ECWMin, ECWMax, aSifsTime;
@@ -871,35 +897,8 @@ void WMMOnAssocRsp(struct adapter *padapter) inx[0 ] =0 ; inx[1 ] =1 ; inx[2 ] =2 ; inx[3 ] =3 ; -if (pregpriv->wifi_spec ==1 ) { -u32 j, tmp, change_inx = false; - -/* entry indx: 0->vo, 1->vi, 2->be, 3->bk. */ -for (i =0 ; i <4 ; i++) { -for (j = i+1 ; j <4 ; j++) { -/* compare CW and AIFS */ -if ((edca[j] &0xFFFF ) < (edca[i] &0xFFFF )) { - change_inx = true; - }else if ((edca[j] &0xFFFF ) == (edca[i] &0xFFFF )) { -/* compare TXOP */ -if ((edca[j] >>16 ) > (edca[i] >>16 )) - change_inx = true; - } - -if (change_inx) { - tmp = edca[i]; - edca[i] = edca[j]; - edca[j] = tmp; - - tmp = inx[i]; - inx[i] = inx[j]; - inx[j] = tmp; - - change_inx = false; - } - } - } - } +if (pregpriv->wifi_spec ==1 ) +sort_wmm_ac_params (inx, edca);for (i =0 ; i <4 ; i++) pxmitpriv->wmm_para_seq[i] = inx[i];
@@ -1510,6 +1509,33 @@ void set_sta_rate(struct adapter *padapter, struct sta_info *psta)Update_RA_Entry (padapter, psta); } +static u32 get_realtek_assoc_AP_vender (struct ndis_80211_var_ie *pIE) +{ +u32 Vender =HT_IOT_PEER_REALTEK ; + +if (pIE->Length >=5 ) { +if (pIE->data[4 ] ==1 ) +/* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */ +/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */ +if (pIE->data[5 ] &RT_HT_CAP_USE_92SE ) +/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; */ + Vender =HT_IOT_PEER_REALTEK_92SE ; + +if (pIE->data[5 ] &RT_HT_CAP_USE_SOFTAP ) + Vender =HT_IOT_PEER_REALTEK_SOFTAP ; + +if (pIE->data[4 ] ==2 ) { +if (pIE->data[6 ] &RT_HT_CAP_USE_JAGUAR_BCUT ) + Vender =HT_IOT_PEER_REALTEK_JAGUAR_BCUTAP ; + +if (pIE->data[6 ] &RT_HT_CAP_USE_JAGUAR_CCUT ) + Vender =HT_IOT_PEER_REALTEK_JAGUAR_CCUTAP ; + } + } + +return Vender; +} +unsigned char check_assoc_AP (u8 *pframe,uint len) {unsigned int i;
@@ -1533,29 +1559,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) }else if (!memcmp (pIE->data,CISCO_OUI ,3 )) {return HT_IOT_PEER_CISCO ; }else if (!memcmp (pIE->data,REALTEK_OUI ,3 )) { -u32 Vender =HT_IOT_PEER_REALTEK ; - -if (pIE->Length >=5 ) { -if (pIE->data[4 ] ==1 ) -/* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */ -/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */ -if (pIE->data[5 ] &RT_HT_CAP_USE_92SE ) -/* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; */ - Vender =HT_IOT_PEER_REALTEK_92SE ; - -if (pIE->data[5 ] &RT_HT_CAP_USE_SOFTAP ) - Vender =HT_IOT_PEER_REALTEK_SOFTAP ; - -if (pIE->data[4 ] ==2 ) { -if (pIE->data[6 ] &RT_HT_CAP_USE_JAGUAR_BCUT ) - Vender =HT_IOT_PEER_REALTEK_JAGUAR_BCUTAP ; - -if (pIE->data[6 ] &RT_HT_CAP_USE_JAGUAR_CCUT ) - Vender =HT_IOT_PEER_REALTEK_JAGUAR_CCUTAP ; - } - } - -return Vender; +return get_realtek_assoc_AP_vender (pIE); }else if (!memcmp (pIE->data,AIRGOCAP_OUI ,3 )) {return HT_IOT_PEER_AIRGO ; }else
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 8/10 staging: rtl8723bs: remove code related to unsupported channel bandwidth
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit 33137187d3c8c82b2ae264bb8313dfa2e2f354e1 ]
remove all code related to unsupported channel bandwidth (i.e. 80, 80+80, 160 Mhz). rtl8723bs NIC works only on 20 and 40 Mhz channels.
Module parameter rtw_bw_mode can only have two
values: 0 and 1 (20 Mhz and 40Mhz). So modify the default value setting to zero the 5Ghz nibble.
Comments modified accordingly.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 15 +----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 34 ------------- drivers/staging/rtl8723bs/hal/odm.h | 3 -- drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 31 ++---------- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 48 +------------------ drivers/staging/rtl8723bs/include/drv_types.h | 8 ++-- drivers/staging/rtl8723bs/include/rtw_rf.h | 4 -- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 ++-- 10 files changed, 19 insertions(+), 144 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -14
@@ -346,9 +346,7 @@ u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset) {u8 center_ch = channel; -if (chnl_bw ==CHANNEL_WIDTH_80 ) { - center_ch =7 ; - }else if (chnl_bw ==CHANNEL_WIDTH_40 ) { +if (chnl_bw ==CHANNEL_WIDTH_40 ) {if (chnl_offset ==HAL_PRIME_CHNL_OFFSET_LOWER ) center_ch = channel +2 ;else
@@ -385,14 +383,6 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne center_ch =rtw_get_center_ch (channel, bwmode, channel_offset); -if (bwmode ==CHANNEL_WIDTH_80 ) { -if (center_ch > channel) - chnl_offset80 =HAL_PRIME_CHNL_OFFSET_LOWER ; -else if (center_ch < channel) - chnl_offset80 =HAL_PRIME_CHNL_OFFSET_UPPER ; -else - chnl_offset80 =HAL_PRIME_CHNL_OFFSET_DONT_CARE ; - }/* set Channel */ if (mutex_lock_interruptible (&(adapter_to_dvobj (padapter)->setch_mutex)))
@@ -923,9 +913,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_if (phtpriv->ht_option == false)return ; -if (pmlmeext->cur_bwmode >=CHANNEL_WIDTH_80 ) -return ; -if (pIE->Length >sizeof (struct HT_info_element ))return ;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -4
@@ -331,15 +331,12 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)u8 query_ra_short_GI (struct sta_info *psta) { -u8 sgi = false, sgi_20m = false, sgi_40m = false, sgi_80m = false; +u8 sgi = false, sgi_20m = false, sgi_40m = false; sgi_20m = psta->htpriv.sgi_20m; sgi_40m = psta->htpriv.sgi_40m;switch (psta->bw_mode) { -case CHANNEL_WIDTH_80 : - sgi = sgi_80m; -break ;case CHANNEL_WIDTH_40 : sgi = sgi_40m;break ;
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +0 -34
@@ -999,7 +999,6 @@ u8 PHY_GetTxPowerIndexBase( ) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -u8 i =0 ;/* default set to 1S */ u8 txPower =0 ;u8 chnlIdx = (Channel-1 );
@@ -1039,18 +1038,6 @@ u8 PHY_GetTxPowerIndexBase( txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S ]; } -/* Willis suggest adopt BW 40M power index while in BW 80 mode */ -else if (BandWidth ==CHANNEL_WIDTH_80 ) { -if ((MGN_MCS0 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT1SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S ]; -if ((MGN_MCS8 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT2SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S ]; -if ((MGN_MCS16 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT3SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S ]; -if ((MGN_MCS24 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT4SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S ]; - - } }else {/* 3 ============================== 5 G ============================== */ if (MGN_6M <= Rate) txPower = pHalData->Index5G_BW40_Base[RFPath][chnlIdx];
@@ -1080,23 +1067,6 @@ u8 PHY_GetTxPowerIndexBase(if ((MGN_MCS24 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT4SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) txPower += pHalData->BW40_5G_Diff[RFPath][TX_4S ]; - }else if (BandWidth ==CHANNEL_WIDTH_80 ) {/* BW80-1S, BW80-2S */ -/* <20121220, Kordan> Get the index of array "Index5G_BW80_Base". */ -u8 channel5G_80M[CHANNEL_MAX_NUMBER_5G_80M ] = {42 ,58 ,106 ,122 ,138 ,155 ,171 }; -for (i =0 ; i <ARRAY_SIZE (channel5G_80M); ++i) -if (channel5G_80M[i] == Channel) - chnlIdx = i; - - txPower = pHalData->Index5G_BW80_Base[RFPath][chnlIdx]; - -if ((MGN_MCS0 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT1SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += + pHalData->BW80_5G_Diff[RFPath][TX_1S ]; -if ((MGN_MCS8 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT2SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW80_5G_Diff[RFPath][TX_2S ]; -if ((MGN_MCS16 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT3SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW80_5G_Diff[RFPath][TX_3S ]; -if ((MGN_MCS23 <= Rate && Rate <=MGN_MCS31 ) || (MGN_VHT4SS_MCS0 <= Rate && Rate <=MGN_VHT4SS_MCS9 )) - txPower += pHalData->BW80_5G_Diff[RFPath][TX_4S ]; } }
@@ -1516,10 +1486,6 @@ static s16 get_bandwidth_idx(const enum CHANNEL_WIDTH bandwidth)return 0 ;case CHANNEL_WIDTH_40 :return 1 ; -case CHANNEL_WIDTH_80 : -return 2 ; -case CHANNEL_WIDTH_160 : -return 3 ;default :return -1 ; }
drivers/staging/rtl8723bs/hal/odm.h +0 -3
@@ -579,9 +579,6 @@ typedef enum tag_Security_Definition {typedef enum tag_Bandwidth_Definition {ODM_BW20M =0 ,ODM_BW40M =1 , -ODM_BW80M =2 , -ODM_BW160M =3 , -ODM_BW10M =4 , }ODM_BW_E ;/* ODM_CMNINFO_BOARD_TYPE */
drivers/staging/rtl8723bs/hal/odm_DIG.c +1 -4
@@ -250,8 +250,6 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI) IGI_target = pDM_Odm->IGI_Base; else if (*pDM_Odm->pBandWidth == ODM_BW40M) IGI_target = pDM_Odm->IGI_Base +2 ; - else if (*pDM_Odm->pBandWidth == ODM_BW80M) - IGI_target = pDM_Odm->IGI_Base +2 ; else IGI_target = pDM_Odm->IGI_Base; pDM_Odm->IGI_target = (u8 ) IGI_target;
@@ -290,8 +288,7 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI)ODM_DBG_LOUD , ("BandWidth =%s, IGI_target = 0x%x, EDCCA_State =%d\n" , - (*pDM_Odm->pBandWidth ==ODM_BW80M ) ?"80M" : - ((*pDM_Odm->pBandWidth ==ODM_BW40M ) ?"40M" :"20M" ), + (*pDM_Odm->pBandWidth ==ODM_BW40M ) ?"40M" :"20M" , IGI_target, EDCCA_State )
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -28
@@ -2814,15 +2814,8 @@ u8 BWMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)u8 BWSettingOfDesc =0 ;struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); -if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_80 ) { -if (pattrib->bwmode ==CHANNEL_WIDTH_80 ) - BWSettingOfDesc =2 ; -else if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) - BWSettingOfDesc =1 ; -else - BWSettingOfDesc =0 ; - }else if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) { -if ((pattrib->bwmode ==CHANNEL_WIDTH_40 ) || (pattrib->bwmode ==CHANNEL_WIDTH_80 )) +if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) { +if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) BWSettingOfDesc =1 ;else BWSettingOfDesc =0 ;
@@ -2840,25 +2833,7 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)u8 SCSettingOfDesc =0 ;struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); -if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_80 ) { -if (pattrib->bwmode ==CHANNEL_WIDTH_80 ) { - SCSettingOfDesc =VHT_DATA_SC_DONOT_CARE ; - }else if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) { -if (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) - SCSettingOfDesc =VHT_DATA_SC_40_LOWER_OF_80MHZ ; -else if (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER ) - SCSettingOfDesc =VHT_DATA_SC_40_UPPER_OF_80MHZ ; - }else { -if ((pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) && (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER )) - SCSettingOfDesc =VHT_DATA_SC_20_LOWEST_OF_80MHZ ; -else if ((pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER ) && (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER )) - SCSettingOfDesc =VHT_DATA_SC_20_LOWER_OF_80MHZ ; -else if ((pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) && (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER )) - SCSettingOfDesc =VHT_DATA_SC_20_UPPER_OF_80MHZ ; -else if ((pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER ) && (pHalData->nCur80MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER )) - SCSettingOfDesc =VHT_DATA_SC_20_UPPERST_OF_80MHZ ; - } - }else if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) { +if (pHalData->CurrentChannelBW ==CHANNEL_WIDTH_40 ) {if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) { SCSettingOfDesc =VHT_DATA_SC_DONOT_CARE ; }else if (pattrib->bwmode ==CHANNEL_WIDTH_20 ) {
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +2 -46
66 lines not on this page · raw message
drivers/staging/rtl8723bs/include/drv_types.h +5 -3
@@ -128,9 +128,11 @@ struct registry_priv {struct wlan_bssid_ex dev_network;u8 ht_enable; -/* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz */ -/* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7 */ -/* 0x21 means enable 2.4G 40MHz & 5G 80MHz */ +/* +* 0: 20 MHz, 1: 40 MHz +* 2.4G use bit 0 ~ 3 +* 0x01 means enable 2.4G 40MHz +*/ u8 bw_mode;u8 ampdu_enable;/* for tx */ u8 rx_stbc;
drivers/staging/rtl8723bs/include/rtw_rf.h +0 -4
@@ -101,10 +101,6 @@ enum RF90_RADIO_PATH {enum CHANNEL_WIDTH {CHANNEL_WIDTH_20 =0 ,CHANNEL_WIDTH_40 =1 , -CHANNEL_WIDTH_80 =2 , -CHANNEL_WIDTH_160 =3 , -CHANNEL_WIDTH_80_80 =4 , -CHANNEL_WIDTH_MAX =5 , };/* Represent Extension Channel Offset in HT Capabilities */
drivers/staging/rtl8723bs/os_dep/os_intfs.c +6 -4
@@ -67,10 +67,12 @@ static int rtw_uapsd_acvi_en;static int rtw_uapsd_acvo_en;int rtw_ht_enable =1 ; -/* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz, 4: 80+80MHz */ -/* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7 */ -/* 0x21 means enable 2.4G 40MHz & 5G 80MHz */ -static int rtw_bw_mode =0x21 ; +/* +* 0: 20 MHz, 1: 40 MHz +* 2.4G use bit 0 ~ 3 +* 0x01 means enable 2.4G 40MHz +*/ +static int rtw_bw_mode =0x01 ;static int rtw_ampdu_enable =1 ;/* for enable tx_ampdu ,0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) */ static int rtw_rx_stbc =1 ;/* 0: disable, 1:enable 2.4g */ static int rtw_ampdu_amsdu;/* 0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 9/10 staging: rtl8723bs: fix camel case in IE structures
In reply to Sasha LevinFrom: Fabio Aiuto <[email protected]>
[ Upstream commit 61ba4fae0a5d81d826810a32c0b30df319d1a925 ]
fix camel case in IE structures all over the driver.
Stable-dep-of: 3bf39f711ff2 ("staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop")
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 20 ++++++------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 28 +++++++++---------- .../staging/rtl8723bs/include/wlan_bssdef.h | 10 +++---- 3 files changed, 29 insertions(+), 29 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +10 -10
@@ -1631,7 +1631,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)for (i = (6 +WLAN_HDR_A3_LEN ); i < pkt_len;) { pIE = (struct ndis_80211_var_ie *)(pframe + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ))/* WMM */ WMM_param_handler (padapter, pIE);
@@ -1652,7 +1652,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)break ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); } pmlmeinfo->state &= (~WIFI_FW_ASSOC_STATE );
@@ -3222,12 +3222,12 @@ void issue_assocreq(struct adapter *padapter)for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.IELength;) { pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) || (!memcmp (pIE->data,WMM_OUI ,4 )) || (!memcmp (pIE->data,WPS_OUI ,4 ))) { - vs_ie_length = pIE->Length; + vs_ie_length = pIE->length;if ((!padapter->registrypriv.wifi_spec) && (!memcmp (pIE->data,WPS_OUI ,4 ))) {/* Commented by Kurt 20110629 * In some older APs, WPS handshake
@@ -3243,26 +3243,26 @@ void issue_assocreq(struct adapter *padapter)break ;case EID_WPA2 : - pframe =rtw_set_ie (pframe,EID_WPA2 , pIE->Length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,EID_WPA2 , pIE->length, pIE->data, &(pattrib->pktlen));break ;case EID_HTCapability:if (padapter->mlmepriv.htpriv.ht_option) {if (!(is_ap_in_tkip (padapter))) {memcpy (&(pmlmeinfo->HT_caps), pIE->data,sizeof (struct HT_caps_element )); - pframe =rtw_set_ie (pframe, EID_HTCapability, pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_HTCapability, pIE->length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); } }break ;case EID_EXTCapability:if (padapter->mlmepriv.htpriv.ht_option) - pframe =rtw_set_ie (pframe, EID_EXTCapability, pIE->Length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_EXTCapability, pIE->length, pIE->data, &(pattrib->pktlen));break ;default :break ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK )
@@ -5887,7 +5887,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)for (i = _FIXED_IE_LENGTH_; i < pnetwork->IELength;) { pIE = (struct ndis_80211_var_ie *)(pnetwork->IEs + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:/* Get WMM IE. */ if (!memcmp (pIE->data,WMM_OUI ,4 ))WMM_param_handler (padapter, pIE);
@@ -5936,7 +5936,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)break ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); }/* check channel, bandwidth, offset and switch */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +14 -14
@@ -913,7 +913,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_if (phtpriv->ht_option == false)return ; -if (pIE->Length >sizeof (struct HT_info_element )) +if (pIE->length >sizeof (struct HT_info_element ))return ; pHT_info = (struct HT_info_element *)pIE->data;
@@ -1003,7 +1003,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) pmlmeinfo->HT_caps_enable =1 ; -for (i =0 ; i < (pIE->Length); i++) { +for (i =0 ; i < (pIE->length); i++) {if (i !=2 ) {/* Commented by Albert 2010/07/12 */ /* Got the endian issue here. */
@@ -1081,11 +1081,11 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)if (phtpriv->ht_option == false)return ; -if (pIE->Length >sizeof (struct HT_info_element )) +if (pIE->length >sizeof (struct HT_info_element ))return ; pmlmeinfo->HT_info_enable =1 ; -memcpy (&(pmlmeinfo->HT_info), pIE->data, pIE->Length); +memcpy (&(pmlmeinfo->HT_info), pIE->data, pIE->length); }void HTOnAssocRsp (struct adapter *padapter)
@@ -1125,11 +1125,11 @@ void ERP_IE_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -if (pIE->Length >1 ) +if (pIE->length >1 )return ; pmlmeinfo->ERP_enable =1 ; -memcpy (&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); +memcpy (&(pmlmeinfo->ERP_IE), pIE->data, pIE->length); }void VCS_update (struct adapter *padapter,struct sta_info *psta)
@@ -1391,10 +1391,10 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, strufor (i =0 ; i < len;) { pIE = (struct ndis_80211_var_ie *)(pframe + (_BEACON_IE_OFFSET_ +WLAN_HDR_A3_LEN ) + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:/* to update WMM parameter set while receiving beacon */ -if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ) && pIE->Length ==WLAN_WMM_LEN )/* WMM */ +if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ) && pIE->length ==WLAN_WMM_LEN )/* WMM */ if (WMM_param_handler (padapter, pIE))report_wmm_edca_update (padapter);
@@ -1414,7 +1414,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, strubreak ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); } }
@@ -1430,7 +1430,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.IELength;) { pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 )))return true;
@@ -1445,7 +1445,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)break ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); }return false;
@@ -1500,7 +1500,7 @@ static u32 get_realtek_assoc_AP_vender(struct ndis_80211_var_ie *pIE) {u32 Vender =HT_IOT_PEER_REALTEK ; -if (pIE->Length >=5 ) { +if (pIE->length >=5 ) {if (pIE->data[4 ] ==1 )/* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */ /* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */
@@ -1531,7 +1531,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)for (i =sizeof (struct ndis_802_11_fix_ie ); i < len;) { pIE = (struct ndis_80211_var_ie *)(pframe + i); -switch (pIE->ElementID) { +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_:if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 ))) {return HT_IOT_PEER_ATHEROS ;
@@ -1556,7 +1556,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)break ; } - i += (pIE->Length +2 ); + i += (pIE->length +2 ); }return HT_IOT_PEER_UNKNOWN ;
drivers/staging/rtl8723bs/include/wlan_bssdef.h +5 -5
@@ -60,14 +60,14 @@ enum NDIS_802_11_NETWORK_INFRASTRUCTURE { };struct ndis_802_11_fix_ie { -u8 Timestamp[8 ]; -u16 BeaconInterval; -u16 Capabilities; +u8 time_stamp[8 ]; +u16 beacon_interval; +u16 capabilities; };struct ndis_80211_var_ie { -u8 ElementID; -u8 Length; +u8 element_id; +u8 length;u8 data[1 ]; };
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 10/10 staging: rtl8723bs: fix OOB reads in is_ap_in_tkip() IE loop
In reply to Sasha LevinFrom: Alexandru Hossu <[email protected]>
[ Upstream commit 3bf39f711ff27c64be8680a8938bcc5001982e81 ]
The loop in is_ap_in_tkip() iterates over IEs without verifying that enough bytes remain before dereferencing the IE header or its payload:
- pIE->element_id and pIE->length are read without checking that i + sizeof(*pIE) <= ie_length, so a truncated IE at the end of the buffer causes an OOB read.
- For WLAN_EID_VENDOR_SPECIFIC the code compares pIE->data + 12, which requires pIE->length >= 16. For WLAN_EID_RSN it compares pIE->data + 8, requiring pIE->length >= 12. Neither requirement is checked.
Add the missing IE header and payload bounds checks and guard each data access with an explicit pIE->length minimum, matching the pattern established in update_beacon_info().
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +10 -2
@@ -1430,15 +1430,23 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.IELength;) { pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i); +if (i +2 > pmlmeinfo->network.IELength) +break ; +if (i +2 + pIE->length > pmlmeinfo->network.IELength) +break ; +switch (pIE->element_id) {case _VENDOR_SPECIFIC_IE_: -if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 ))) +if (pIE->length >=16 && + !memcmp (pIE->data,RTW_WPA_OUI ,4 ) && + !memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 ))return true;break ;case _RSN_IE_2_: -if (!memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 )) +if (pIE->length >=12 && + !memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 ))return true;default :
Signature · 1 line
2.53.0