From nobody Fri Apr 3 01:24:05 2026 Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 064F739C64C for ; Thu, 26 Mar 2026 01:43:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774489389; cv=none; b=HG7XlRdPIHiCBP3mIdY/AKSj1uX2tgfBZHvSQnu7mTy7Hlibnzipuuiajh+9RO3QaQ28XrpT5LhLHiEItFa0kiMlo+N4ZREMKsGl58x4yXYCz/c2cNq6Za17OVZqAL5oIVanTXhXAr4jjZ8DLlOIO2bu8xgyy6a+XSBGHiQJ3O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774489389; c=relaxed/simple; bh=59bC//0dOQ4leVabfaDZKZKgmuHhrHNNwfW41UlUVp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BM8/tvI8Wi57DTjiewzGhNqugqZcglxyHpBTeq7qIy5o2lZ4Na32yYI0k0Rf0k8nXsvs+gfBDNAWDDj6jDU3v0tPM/RhgdY+FcrYYEdNNntv+ANy1FYMSszQNxZRaTUJ0vZiEtDjkJYBF8ML5TnXJ4y3z1aGkkby6GWh5FhQ/Hk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GmCv8bjm; arc=none smtp.client-ip=209.85.222.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GmCv8bjm" Received: by mail-ua1-f49.google.com with SMTP id a1e0cc1a2514c-944168e8c5fso217962241.2 for ; Wed, 25 Mar 2026 18:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774489385; x=1775094185; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wLXaunln+3HsTOwtqtf6jxVt3H77rN2+Ymn72VKGXQs=; b=GmCv8bjm1s6LXeaFuLErWKkzd01X+oVnRoUuIt2m6ZmOECXqy/xKYOPdHK/5wpCabJ Y6nbWtIoPZOzo+klfMHghAZM+lGeA4LgZ/+jWm+S5f2WuaWe9KCOUi9C7868LVEa44Fp s0LFsU3iHe2eMo6/aivClFtwm3XghlQO7Q2eIdZ1zmJEan8Bl2bSjoIg8YJ2JJhMS96N x1DWWVehgzi7UUpJNvYpcGTMCwmWu2n0WUFOvLIBqshLNR150ixy5bJnY6mvcjelfqgB tYOhhUT4dc268jTWDNW7VR6Z3J7iDqowR623iF69YEJZH/NbLo6BVlI3R/bJRTgdtxZL JIfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774489385; x=1775094185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wLXaunln+3HsTOwtqtf6jxVt3H77rN2+Ymn72VKGXQs=; b=GAuNN69xErTnPqrQbac7KuWn4EJky+IvCItvCY/IVy9Io4tXitpXVCWVPn+NDlwnAq XRuaE31ylnZHkddq+HkQbfqRN+X8ARd2/Bb0Z6ivB49sJfh63LNrQ8pCggoPkSu6pK9S lvE7KMcdEPlL0nzz0hkU+HQ+c+aPlfWmS7EI4gJBfntuijPPpC4grwBLpTImUECgRelb f2jnF9h4V0sVL8IQdc8e80G1c3LBNOyifmF8RsljPf7vX/6MFLRJk98yWYTLHP1lKWma pyhDwwIk/W7O4hTc0dY1f6tqs7Fz0wQke8AuQ8X9jbiH+N/78S/55XqKixV1pPHSi+0b UCTQ== X-Forwarded-Encrypted: i=1; AJvYcCXkFo81oHlS0h6cjtMyQ9WEIi9Lv0ARIlNwB87yPdEHSewRwjkzqHHNTQ+hkW9PvLlqmr4gtQw/VDlox0M=@vger.kernel.org X-Gm-Message-State: AOJu0YxFBNfmOzvZw3JxdRJqzWWciU6eKkGZAIzdLR/NVFMAIbcGSCAT NJKUac+r7qrCwHDrFeXfNbRTebJt+VrEMKEjerCp3/4lAuFazWrmfQl9 X-Gm-Gg: ATEYQzzKTbDJsqvuEjyqiPlEFBpAUhecGuj+g4FC9qP5PUDNY+XB95fh9DRKWB19QdY vfUrNzQOUOVmN+EAyMOQ8LECps1aNL0Yo2THOx+zNYPmQM65rVClNW2kZy7O/T0xnjK3HN+jOfk JUHppDpUPnyCx+OoUD/TzgTWg7QogyEdkJTZ+P0WuWczol2HTX+P7r6N5RjW/HYjEn9/7m4mCBg vU7Ec/3eDfx74xXxR65vzRAD5fby6fXQQPc20rXCGYYnHN+iAeBKf1LrTpERphOGP4aEiweXUR+ sne6N1aD2VKlHmWtgwLkyKpM0XbZcUhtj+y7GJ4NwouJV9iwInn1VGVlb1Ul7Kla0QRnI4/SvkM mYFswEPEeH7+SHCUVFR4lB1VjETkWaMJheHizekyj8h7nvJG+009BFA6sE/oBrZH9oz90mKBycl RZJuICQtJnBuz+WCJvkjKtOK6CycwU6Hm1gQb198CwcAWqZt1NUFOkig5ff/Z5tKIkzsU/ZuEOk MDss2oH2XjC5sqj5fg= X-Received: by 2002:a05:6102:604f:b0:5ff:c3c2:81f3 with SMTP id ada2fe7eead31-60387434a6bmr3036887137.32.1774489384925; Wed, 25 Mar 2026 18:43:04 -0700 (PDT) Received: from localhost.localdomain ([131.255.96.187]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-604d50c928asm1661643137.5.2026.03.25.18.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 18:43:04 -0700 (PDT) From: Marcos Andrade To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Marcos Andrade Subject: [PATCH 2/2] staging: rtl8723bs: fix coding style and remove dead code Date: Thu, 26 Mar 2026 01:42:21 +0000 Message-ID: <20260326014221.525368-3-marcosandrade95963@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326014221.525368-1-marcosandrade95963@gmail.com> References: <20260326014221.525368-1-marcosandrade95963@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix various coding style issues in rtw_wlan_util.c to align the code with the Linux kernel formatting standards. Specifically, this patch: - Resolves lines exceeding the 80-column limit. - Removes redundant and unnecessary parentheses in complex conditionals. - Deletes commented-out dead code that clutters the logic. - Fixes alignment to correctly match open parentheses. These changes improve overall code readability and address multiple checks reported by checkpatch.pl. No functional changes are introduced. Signed-off-by: Marcos Andrade --- Note: checkpatch.pl reports some CHECKs regarding CamelCase variables (e.g., ShortPreamble) in the modified lines. These were intentionally left untouched to keep this patch strictly focused on whitespace and alignment cleanups. They can be addressed in a future patch. .../staging/rtl8723bs/core/rtw_wlan_util.c | 128 +++++++++++------- 1 file changed, 82 insertions(+), 46 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 41868dda3838..fdaaf9b5e178 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -276,7 +276,8 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8= ch) cnt +=3D scnprintf(msg + cnt, len - cnt, "C"); else cnt +=3D scnprintf(msg + cnt, len - cnt, "_"); - if (iface->wdinfo.listen_channel =3D=3D ch && !rtw_p2p_chk_state(&iface= ->wdinfo, P2P_STATE_NONE)) + if (iface->wdinfo.listen_channel =3D=3D ch && + !rtw_p2p_chk_state(&iface->wdinfo, P2P_STATE_NONE)) cnt +=3D scnprintf(msg + cnt, len - cnt, "L"); else cnt +=3D scnprintf(msg + cnt, len - cnt, "_"); @@ -334,7 +335,8 @@ void r8723bs_select_channel(struct adapter *padapter, u= nsigned char channel) mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); } =20 -void set_channel_bwmode(struct adapter *padapter, unsigned char channel, u= nsigned char channel_offset, unsigned short bwmode) +void set_channel_bwmode(struct adapter *padapter, unsigned char channel, + unsigned char channel_offset, unsigned short bwmode) { u8 center_ch, chnl_offset80 =3D HAL_PRIME_CHNL_OFFSET_DONT_CARE; =20 @@ -350,8 +352,8 @@ void set_channel_bwmode(struct adapter *padapter, unsig= ned char channel, unsigne rtw_set_oper_bw(padapter, bwmode); rtw_set_oper_choffset(padapter, channel_offset); =20 - rtw_hal_set_chnl_bw(padapter, center_ch, bwmode, channel_offset, chnl_off= set80); /* set center channel */ - + /* set center channel */ + rtw_hal_set_chnl_bw(padapter, center_ch, bwmode, channel_offset, chnl_off= set80); mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); } =20 @@ -380,7 +382,8 @@ int is_client_associated_to_ap(struct adapter *padapter) pmlmeext =3D &padapter->mlmeextpriv; pmlmeinfo =3D &(pmlmeext->mlmext_info); =20 - if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x= 03) =3D=3D WIFI_FW_STATION_STATE)) + if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && + ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_STATION_STATE)) return true; else return _FAIL; @@ -391,7 +394,8 @@ int is_client_associated_to_ibss(struct adapter *padapt= er) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); =20 - if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state & 0x= 03) =3D=3D WIFI_FW_ADHOC_STATE)) + if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && + ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE)) return true; else return _FAIL; @@ -452,7 +456,8 @@ void _write_cam(struct adapter *padapter, u8 entry, u16= ctrl, u8 *mac, u8 *key) break; default: i =3D (j - 2) << 2; - val =3D (key[i] | (key[i + 1] << 8) | (key[i + 2] << 16) | (key[i + 3] = << 24)); + val =3D (key[i] | (key[i + 1] << 8) | + (key[i + 2] << 16) | (key[i + 3] << 24)); break; } =20 @@ -466,7 +471,12 @@ void _write_cam(struct adapter *padapter, u8 entry, u1= 6 ctrl, u8 *mac, u8 *key) void _clear_cam_entry(struct adapter *padapter, u8 entry) { unsigned char null_sta[] =3D {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - unsigned char null_key[] =3D {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned char null_key[] =3D { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 + }; =20 _write_cam(padapter, entry, 0, null_sta, null_key); } @@ -570,8 +580,8 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta= _info *sta, u8 kid) =20 mlmeinfo =3D &adapter->mlmeextpriv.mlmext_info; =20 - if ((((mlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) || ((mlmeinfo->st= ate & 0x03) =3D=3D WIFI_FW_ADHOC_STATE)) - && !sta) { + if ((((mlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) || + ((mlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE)) && !sta) { /* AP/Ad-hoc mode group key: static alloction to default key by key ID */ if (kid > 3) { netdev_dbg(adapter->pnetdev, @@ -588,7 +598,10 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct st= a_info *sta, u8 kid) =20 if (!sta) { if (!(mlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) { - /* bypass STA mode group key setting before connected(ex:WEP) because = bssid is not ready */ + /* + * bypass STA mode group key setting before connected(ex:WEP) + * because bssid is not ready + */ goto bitmap_handle; } =20 @@ -597,7 +610,10 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct st= a_info *sta, u8 kid) =20 i =3D _rtw_camid_search(adapter, addr, kid); if (i >=3D 0) { - /* Fix issue that pairwise and group key have same key id. Pairwise key= first, group key can overwirte group only(ex: rekey) */ + /* + * Fix issue that pairwise and group key have same key id. + * Pairwise key first, group key can overwirte group only(ex: rekey) + */ if (sta || _rtw_camid_is_gk(adapter, i)) cam_id =3D i; else @@ -780,7 +796,8 @@ void WMMOnAssocRsp(struct adapter *padapter) ACM =3D (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN >> 4) & 0x01; =20 /* AIFS =3D AIFSN * slot time + SIFS - r2t phy delay */ - AIFS =3D (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN & 0x0f) * pmlmeinf= o->slotTime + aSifsTime; + AIFS =3D (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN & 0x0f) * + pmlmeinfo->slotTime + aSifsTime; =20 ECWMin =3D (pmlmeinfo->WMM_param.ac_param[i].CW & 0x0f); ECWMax =3D (pmlmeinfo->WMM_param.ac_param[i].CW & 0xf0) >> 4; @@ -895,8 +912,6 @@ static void bwmode_update_check(struct adapter *padapte= r, struct ndis_80211_var_ struct wlan_bssid_ex *cur_network =3D &(pmlmeinfo->network); struct sta_priv *pstapriv =3D &padapter->stapriv; =20 - /* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_= offset, pmlmeext->cur_bwmode); */ - /* update ap's stainfo */ psta =3D rtw_get_stainfo(pstapriv, cur_network->mac_address); if (psta) { @@ -944,16 +959,18 @@ void HT_caps_handler(struct adapter *padapter, struct= ndis_80211_var_ie *pIE) max_AMPDU_len =3D min(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & = 0x3, pIE->data[i] & 0x3); =20 - min_MPDU_spacing =3D max(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para= & 0x1c, - pIE->data[i] & 0x1c); + min_MPDU_spacing =3D max(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para= & + 0x1c, pIE->data[i] & 0x1c); =20 - pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para =3D max_AMPDU_len | min_= MPDU_spacing; + pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para =3D + max_AMPDU_len | min_MPDU_spacing; } } =20 /* update the MCS set */ for (i =3D 0; i < 16; i++) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &=3D pmlmeext->default_s= upported_mcs_set[i]; + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &=3D + pmlmeext->default_supported_mcs_set[i]; =20 /* update the MCS rates */ set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RA= TE_1R); @@ -1014,7 +1031,6 @@ void HTOnAssocRsp(struct adapter *padapter) pmlmeinfo->HT_enable =3D 1; } else { pmlmeinfo->HT_enable =3D 0; - /* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_= offset, pmlmeext->cur_bwmode); */ return; } =20 @@ -1135,7 +1151,9 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *p= frame, u32 packet_len) if (!bssid) return true; =20 - if ((pmlmepriv->timeBcnInfoChkStart !=3D 0) && (jiffies_to_msecs(jiffies = - pmlmepriv->timeBcnInfoChkStart) > DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIO= D_IN_MS)) { + if ((pmlmepriv->timeBcnInfoChkStart !=3D 0) && + (jiffies_to_msecs(jiffies - pmlmepriv->timeBcnInfoChkStart) > + DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS)) { pmlmepriv->timeBcnInfoChkStart =3D 0; pmlmepriv->NumOfBcnInfoChkFail =3D 0; } @@ -1153,7 +1171,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *p= frame, u32 packet_len) =20 /* check bw and channel offset */ /* parsing HT_CAP_IE */ - p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, = &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, + &len, bssid->ie_length - _FIXED_IE_LENGTH_); if (p && len > 0) { pht_cap =3D (struct ieee80211_ht_cap *)(p + 2); ht_cap_info =3D le16_to_cpu(pht_cap->cap_info); @@ -1161,7 +1180,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *p= frame, u32 packet_len) ht_cap_info =3D 0; } /* parsing HT_INFO_IE */ - p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &= len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, + &len, bssid->ie_length - _FIXED_IE_LENGTH_); if (p && len > 0) { pht_info =3D (struct HT_info_element *)(p + 2); ht_info_infos_0 =3D pht_info->infos[0]; @@ -1174,13 +1194,16 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 = *pframe, u32 packet_len) /* bcn_info_update */ cur_network->bcn_info.ht_cap_info =3D ht_cap_info; cur_network->bcn_info.ht_info_infos_0 =3D ht_info_infos_0; - /* to do : need to check that whether modify related register of BB or = not */ + /* + * to do : need to check that whether modify related register of BB or = not + */ } /* goto _mismatch; */ } =20 /* Checking for channel */ - p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_DS_PARAMS, &len= , bssid->ie_length - _FIXED_IE_LENGTH_); + p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_DS_PARAMS, + &len, bssid->ie_length - _FIXED_IE_LENGTH_); if (p) { bcn_channel =3D *(p + 2); } else {/* In 5G, some ap do not have DSSET IE checking HT info for chann= el */ @@ -1197,7 +1220,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *p= frame, u32 packet_len) =20 /* checking SSID */ ssid_len =3D 0; - p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_SSID, &len, bss= id->ie_length - _FIXED_IE_LENGTH_); + p =3D rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, WLAN_EID_SSID, + &len, bssid->ie_length - _FIXED_IE_LENGTH_); if (p) { ssid_len =3D *(p + 1); if (ssid_len > NDIS_802_11_LENGTH_SSID) @@ -1207,7 +1231,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *p= frame, u32 packet_len) bssid->ssid.ssid_length =3D ssid_len; =20 if (memcmp(bssid->ssid.ssid, cur_network->network.ssid.ssid, 32) || - bssid->ssid.ssid_length !=3D cur_network->network.ssid.ssid_length) + bssid->ssid.ssid_length !=3D cur_network->network.ssid.ssid_length) if (bssid->ssid.ssid[0] !=3D '\0' && bssid->ssid.ssid_length !=3D 0) /* not hidden ssid */ goto _mismatch; @@ -1268,8 +1292,10 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *= pframe, u32 packet_len) =20 pmlmepriv->NumOfBcnInfoChkFail++; =20 - if ((pmlmepriv->timeBcnInfoChkStart !=3D 0) && (jiffies_to_msecs(jiffies = - pmlmepriv->timeBcnInfoChkStart) <=3D DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PE= RIOD_IN_MS) - && (pmlmepriv->NumOfBcnInfoChkFail >=3D DISCONNECT_BY_CHK_BCN_FAIL_THRES= HOLD)) { + if ((pmlmepriv->timeBcnInfoChkStart !=3D 0) && + (jiffies_to_msecs(jiffies - pmlmepriv->timeBcnInfoChkStart) <=3D + DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS) && + (pmlmepriv->NumOfBcnInfoChkFail >=3D DISCONNECT_BY_CHK_BCN_FAIL_THRE= SHOLD)) { pmlmepriv->timeBcnInfoChkStart =3D 0; pmlmepriv->NumOfBcnInfoChkFail =3D 0; return _FAIL; @@ -1292,7 +1318,8 @@ void update_beacon_info(struct adapter *padapter, u8 = *pframe, uint pkt_len, stru switch (pIE->element_id) { case WLAN_EID_VENDOR_SPECIFIC: /* to update WMM parameter set while receiving beacon */ - if (!memcmp(pIE->data, WMM_PARA_OUI, 6) && pIE->length =3D=3D WLAN_WMM_= LEN) /* WMM */ + /* WMM */ + if (!memcmp(pIE->data, WMM_PARA_OUI, 6) && pIE->length =3D=3D WLAN_WMM_= LEN) if (WMM_param_handler(padapter, pIE)) report_wmm_edca_update(padapter); =20 @@ -1330,7 +1357,8 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) =20 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 ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) && + (!memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4))) return true; =20 break; @@ -1433,7 +1461,8 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) =20 switch (pIE->element_id) { case WLAN_EID_VENDOR_SPECIFIC: - if ((!memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (!memcmp(pIE->data, ARTHE= ROS_OUI2, 3))) + if ((!memcmp(pIE->data, ARTHEROS_OUI1, 3)) || + (!memcmp(pIE->data, ARTHEROS_OUI2, 3))) return HT_IOT_PEER_ATHEROS; else if ((!memcmp(pIE->data, BROADCOM_OUI1, 3)) || (!memcmp(pIE->data, BROADCOM_OUI2, 3)) || @@ -1502,17 +1531,21 @@ void update_capinfo(struct adapter *Adapter, u16 up= dateCap) { if (updateCap & cShortPreamble) { /* Short Preamble */ - if (pmlmeinfo->preamble_mode !=3D PREAMBLE_SHORT) { /* PREAMBLE_LONG o= r PREAMBLE_AUTO */ + /* PREAMBLE_LONG or PREAMBLE_AUTO */ + if (pmlmeinfo->preamble_mode !=3D PREAMBLE_SHORT) { ShortPreamble =3D true; pmlmeinfo->preamble_mode =3D PREAMBLE_SHORT; - rtw_hal_set_hwreg(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble); + rtw_hal_set_hwreg(Adapter, HW_VAR_ACK_PREAMBLE, + (u8 *)&ShortPreamble); } } else { /* Long Preamble */ - if (pmlmeinfo->preamble_mode !=3D PREAMBLE_LONG) { /* PREAMBLE_SHORT o= r PREAMBLE_AUTO */ + /* PREAMBLE_SHORT or PREAMBLE_AUTO */ + if (pmlmeinfo->preamble_mode !=3D PREAMBLE_LONG) { ShortPreamble =3D false; pmlmeinfo->preamble_mode =3D PREAMBLE_LONG; - rtw_hal_set_hwreg(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble); + rtw_hal_set_hwreg(Adapter, HW_VAR_ACK_PREAMBLE, + (u8 *)&ShortPreamble); } } } @@ -1525,7 +1558,7 @@ void update_capinfo(struct adapter *Adapter, u16 upda= teCap) if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N)) { pmlmeinfo->slotTime =3D SHORT_SLOT_TIME; } else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) { - if ((updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_= Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */) + if ((updateCap & cShortSlotTime)) /* Short Slot Time */ pmlmeinfo->slotTime =3D SHORT_SLOT_TIME; else @@ -1565,7 +1598,7 @@ void update_wireless_mode(struct adapter *padapter) pmlmeext->cur_wireless_mode =3D network_type & padapter->registrypriv.wir= eless_mode; =20 SIFS_Timer =3D 0x0a0a0808; /* 0x0808 -> for CCK, 0x0a0a -> for OFDM */ - /* change this value if having IOT issues. */ + /* change this value if having IOT issues. */ =20 SetHwReg8723BS(padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer); =20 @@ -1597,7 +1630,8 @@ int update_sta_support_rate(struct adapter *padapter,= u8 *pvar_ie, uint var_ie_l struct mlme_ext_priv *pmlmeext =3D &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); =20 - pIE =3D (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, WLAN_EID_SUPP_RAT= ES, &ie_len, var_ie_len); + pIE =3D (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, WLAN_EID_SUPP_RAT= ES, + &ie_len, var_ie_len); if (!pIE) return _FAIL; if (ie_len > sizeof(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates)) @@ -1606,9 +1640,12 @@ int update_sta_support_rate(struct adapter *padapter= , u8 *pvar_ie, uint var_ie_l memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); supportRateNum =3D ie_len; =20 - pIE =3D (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, WLAN_EID_EXT_SUPP= _RATES, &ie_len, var_ie_len); - if (pIE && (ie_len <=3D sizeof(pmlmeinfo->FW_sta_info[cam_idx].SupportedR= ates) - supportRateNum)) - memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum)= , pIE->data, ie_len); + pIE =3D (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, WLAN_EID_EXT_SUPP= _RATES, + &ie_len, var_ie_len); + if (pIE && (ie_len <=3D sizeof(pmlmeinfo->FW_sta_info[cam_idx].SupportedR= ates) - + supportRateNum)) + memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + + supportRateNum), pIE->data, ie_len); =20 return _SUCCESS; } @@ -1682,11 +1719,9 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmee= xt, u8 *pframe, uint len) =20 if (delay_ms >=3D 8) pmlmeext->bcn_delay_cnt[8]++; - /* pmlmeext->bcn_delay_ratio[8] =3D (pmlmeext->bcn_delay_cnt[8] * 100) /= pmlmeext->bcn_cnt; */ else pmlmeext->bcn_delay_cnt[delay_ms]++; - /* pmlmeext->bcn_delay_ratio[delay_ms] =3D (pmlmeext->bcn_delay_cnt[dela= y_ms] * 100) /pmlmeext->bcn_cnt; */ - /* dump for adaptive_early_32k */ + if (pmlmeext->bcn_cnt > 100 && (pmlmeext->adaptive_tsf_done =3D=3D true))= { u8 ratio_20_delay, ratio_80_delay; u8 DrvBcnEarly, DrvBcnTimeOut; @@ -1697,7 +1732,8 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeex= t, u8 *pframe, uint len) DrvBcnTimeOut =3D 0xff; =20 for (i =3D 0; i < 9; i++) { - pmlmeext->bcn_delay_ratio[i] =3D (pmlmeext->bcn_delay_cnt[i] * 100) / p= mlmeext->bcn_cnt; + pmlmeext->bcn_delay_ratio[i] =3D (pmlmeext->bcn_delay_cnt[i] * 100) / + pmlmeext->bcn_cnt; =20 ratio_20_delay +=3D pmlmeext->bcn_delay_ratio[i]; ratio_80_delay +=3D pmlmeext->bcn_delay_ratio[i]; --=20 2.53.0