From nobody Thu Oct 2 00:49:30 2025 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 3A7A92BF3D7 for ; Mon, 29 Sep 2025 06:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759128638; cv=none; b=CqE3AdV/efy3fcXEzghNMrzKs+Wlm1CEqvBjNz+nebqXCGGGuBzDOyiwvIuY22UMcaC7EbgQNMuhnN0qqyRUCGVK93lWWg/syQ0uTayJx2b9soa0EYeuBy3GgUVZBYzXkqvW4ZHAvLN75Ps9J5FP50aQqR3XksjP2ghVK6dKvOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759128638; c=relaxed/simple; bh=clfMBU8VogL4u+MkkrC3T4bJw78aLcbA5v/zq/eMwD8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SnGwbglbP+bmyhtc6wSr4d4oseSxpdjAc27PlEcsTAQoSKA3ap6gEAiGUS46WBKO9njx4qfZbbHaTjee+F2WS9pGzq1giBN/7oGnEdzOZcn67jmbSgHa95+cqXCrNT9T61aFNP2D0IIbCCZsEmVav3jrpAttlXXhR8D4SGIO2Tg= 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=fm2TQOVi; arc=none smtp.client-ip=209.85.160.179 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="fm2TQOVi" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-4de584653cfso42585871cf.0 for ; Sun, 28 Sep 2025 23:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759128635; x=1759733435; 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=aBybXp7D/ChMxrzkDUos6YfmdnO0tGPjFuzwQYdhFJ0=; b=fm2TQOViusJw8rgB3Bj084R0lPk2TGMTlMmFtlAXBK/O/MsYEk/VnHbw6OUnpyLZxB jMrXiUwJ6JVN0zShCl7JGgr3kQQfQJTq2ZWszgDvB0ZpZKa5Lbhag7aKiaWy0v0/bltq GqNEo3dYw1xLQJq4LgwLmJbvniMRXx48uCGuj3ogQtklwiO4GnCaJS3JHuDBdV+3FxLj Cbxaj+gcFvIRSI9COePsvdKBAJ4txgsY/Uo+Bs5F0qtPTBa9P4D+u4zjEpSesCmN6nbv rC95kdCny6WHaS73ZFmhDMCNx3AiD+Ut52BYvUW6/5S9Z9J3NfXCHAcW7ESdPIn54wHl B24g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759128635; x=1759733435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aBybXp7D/ChMxrzkDUos6YfmdnO0tGPjFuzwQYdhFJ0=; b=jG5gx7t/OrOFqfDlpjB53tlXgk5m59qDxvwSC/q/9WzeSyMTRNygekW97SS4AmeVcj owVat+SFD42xzveJA4YJ5G95ka+73LXkPqpuxWTybrFPdyfC21Q+tdHqkEtVP3/GQqIP B5/kv0faWKDZCDfgmjeZAHCCgo160Ya3GI3ZnJdGakMIlnzRYFPWVDLR7LlteEx6vwr8 ptlHw5Ek7FvHqTLxNvEnXz3s3WO7aKj92+zKn30oO9STo+QpPIy6ZPVMciBJfuz3HvSu DxefrXF/fGGK08YnzGB8xwdzP9FF26fXlcaaG4TZS2b4Ud/2o4U9syl9/w3q0sGgUwUz 56DA== X-Forwarded-Encrypted: i=1; AJvYcCUROcYTfFynHDNDLy3mlAo7+smDif0nJ7XFKpeU3n1tWGyVp/wNZp93Z4IJZ1ubx3ycta9i1SIw/VdzLVM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3+mnjD0VzOsHv8Kdt+xzPG1VKrPh1IyH57QIlN5EpyopxikHc O6gws7J2Nj0NBgFGcq0RyqsSeKG3fjDzuFrbPunlVDRLEkpT/6tkHBoj X-Gm-Gg: ASbGncswtCQ/4AKzcUQZUYBuxsDzCcxwMeGw0QBsV49rSz+D+nD44A8+eiP57tZ+iFc KI2xZ69DS8LEUhyDyjL3dqTgqHyZe+KoAXiK5Br6k3akECk5z1QYSOsj06b2xrN1TqzV8PQ99hS 1UZcI3jJkZAeNsfZJEG+YGgJTlAQbgeDLgpe0ChnzBjAUfGarkNpCpjf/Ek4okG49iNi7z6Wp8O 3+pWCjyABCqd6I1U3P1yo0WOdp05GSQR4alQXEYSUN14bJNXCw/AzJ3guz+NTh1zM7QRCHC60j7 QQgpeD0xN5RBgncKvOnWWR9c3bIWQzgYHe1wskJ8oLD1X1MGLhA829+GEAoJFsYwAylW6CB6fiu KErcMKpguQSLeDBrxQwRnX0STCJxyzqS4rJ9FVuWoHC7ltWCt//w= X-Google-Smtp-Source: AGHT+IEHa4gwKY4qhQ2XxM7wXZ70+LyNCnNJcuKlMshfQZzc7KjMhoh+woVy8S8SQ/YfThy7sMIptQ== X-Received: by 2002:ac8:7f15:0:b0:4b4:989a:a272 with SMTP id d75a77b69052e-4da4b808005mr199068581cf.47.1759128634974; Sun, 28 Sep 2025 23:50:34 -0700 (PDT) Received: from linux-kernel-dev-start.. ([159.203.26.228]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4db10874bb9sm69517671cf.24.2025.09.28.23.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Sep 2025 23:50:34 -0700 (PDT) From: Vivek BalachandharTN To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, vivek.balachandhar@gmail.com Subject: [PATCH v3 03/15] staging: rtl8723bs: fix overlong lines to conform with kernel coding style Date: Mon, 29 Sep 2025 06:49:48 +0000 Message-Id: <20250929065000.1010848-4-vivek.balachandhar@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250929065000.1010848-1-vivek.balachandhar@gmail.com> References: <20250929065000.1010848-1-vivek.balachandhar@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 multiple instances of lines exceeding 80 characters to conform with the Linux kernel coding style guidelines. Keeping lines within this limit improves readability. No functional changes were made; this commit is purely a style cleanup. Identified using checkpatch.pl. Signed-off-by: Vivek BalachandharTN --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 215 +++++++++++++++------- 1 file changed, 147 insertions(+), 68 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 43244e950faa..3eeea832dcb6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -52,8 +52,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =3D NULL; pmlmepriv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ pmlmepriv->cur_network.network.infrastructure_mode =3D Ndis802_11AutoUnkn= own; - pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this varable to "active_mode" (Jeff) */ - + /* 1: active, 0: passive. Maybe someday we should rename this + * varable to "active_mode" (Jeff) + */ + pmlmepriv->scan_mode =3D SCAN_ACTIVE; spin_lock_init(&pmlmepriv->lock); INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue); spin_lock_init(&pmlmepriv->free_bss_pool.lock); @@ -125,7 +127,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlme= priv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_i= e_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe= _req_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_prob= e_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_g= o_probe_resp_ie_len); + rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 @@ -376,7 +379,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct w= lan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_ESS)); } =20 -struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,= struct wlan_network *network) +struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, + struct wlan_network *network) { struct list_head *phead, *plist; struct wlan_network *found =3D NULL; @@ -427,7 +431,8 @@ void update_network(struct wlan_bssid_ex *dst, struct w= lan_bssid_ex *src, long rssi_final; =20 /* The rule below is 1/5 for sample value, 4/5 for history value */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&pa= dapter->mlmepriv.cur_network.network, src, 0)) { + 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*/ ss_final =3D padapter->recvpriv.signal_strength; sq_final =3D padapter->recvpriv.signal_qual; @@ -438,11 +443,15 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, rssi_final =3D rssi_ori; } else { if (sq_smp !=3D 101) { /* from the right channel */ - ss_final =3D ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_inf= o.signal_strength) * 4) / 5; - sq_final =3D ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info= .signal_quality) * 4) / 5; + ss_final =3D ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) * 4) / 5; + sq_final =3D ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) * 4) / 5; rssi_final =3D (src->rssi + dst->rssi * 4) / 5; } else { - /* bss info not receiving from the right channel, use the original RX s= ignal infos */ + /* bss info not receiving from the right channel, + * use the original RX signal infos + */ ss_final =3D dst->phy_info.signal_strength; sq_final =3D dst->phy_info.signal_quality; rssi_final =3D dst->rssi; @@ -469,10 +478,13 @@ static void update_current_network(struct adapter *ad= apter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); =20 - if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) && (is_same_networ= k(&pmlmepriv->cur_network.network, pnetwork, 0))) { + if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) && + (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) { update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length); + rtw_update_protection(adapter, + (pmlmepriv->cur_network.network.ies) + + sizeof(struct ndis_802_11_fix_ie), + pmlmepriv->cur_network.network.ie_length); } } =20 @@ -609,7 +621,9 @@ int rtw_is_desired_network(struct adapter *adapter, str= uct wlan_network *pnetwor privacy =3D pnetwork->network.privacy; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->= network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) + if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, + pnetwork->network.ie_length - _FIXED_IE_LENGTH_, + NULL, &wps_ielen)) return true; else return false; @@ -622,7 +636,9 @@ int rtw_is_desired_network(struct adapter *adapter, str= uct wlan_network *pnetwor bselected =3D false; =20 if (psecuritypriv->ndisauthtype =3D=3D Ndis802_11AuthModeWPA2PSK) { - p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_R= SN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); + p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, + WLAN_EID_RSN, &ie_len, + (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) bselected =3D true; else @@ -634,7 +650,8 @@ int rtw_is_desired_network(struct adapter *adapter, str= uct wlan_network *pnetwor bselected =3D false; =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) { - if (pnetwork->network.infrastructure_mode !=3D pmlmepriv->cur_network.ne= twork.infrastructure_mode) + if (pnetwork->network.infrastructure_mode !=3D + pmlmepriv->cur_network.network.infrastructure_mode) bselected =3D false; } =20 @@ -662,12 +679,14 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 /* update IBSS_network 's timestamp */ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) =3D=3D true) { - if (!memcmp(&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_a= ddress, ETH_ALEN)) { + if (!memcmp(&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address, ETH_ALEN)) { struct wlan_network *ibss_wlan =3D NULL; =20 memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8); spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->ma= c_address); + ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + pnetwork->mac_address); if (ibss_wlan) { memcpy(ibss_wlan->network.ies, pnetwork->ies, 8); spin_unlock_bh(&pmlmepriv->scanned_queue.lock); @@ -718,13 +737,17 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret =3D _SUCCESS; - struct wlan_bssid_ex *pdev_network =3D &adapter->registrypriv.dev_= network; + struct wlan_bssid_ex *pdev_network =3D + &adapter->registrypriv.dev_network; u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ + /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY; + * because don't set assoc_timer + */ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndi= s_802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); @@ -751,8 +774,9 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_indicate_connect(adapter); } else { if (rtw_to_roam(adapter) !=3D 0) { - if (rtw_dec_to_roam(adapter) =3D=3D 0 - || _SUCCESS !=3D rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,= 1, NULL, 0) + if (rtw_dec_to_roam(adapter) =3D=3D 0 || + _SUCCESS !=3D rtw_sitesurvey_cmd(adapter, + &pmlmepriv->assoc_ssid, 1, NULL, 0) ) { rtw_set_to_roam(adapter, 0); rtw_free_assoc_resources(adapter, 1); @@ -771,8 +795,9 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) { if (rtw_select_roaming_candidate(pmlmepriv) =3D=3D _SUCCESS) { - receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address - , WLAN_REASON_ACTIVE_ROAM); + receive_disconnect(adapter, + pmlmepriv->cur_network.network.mac_address, + WLAN_REASON_ACTIVE_ROAM); } } } @@ -974,7 +999,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort =3D false; } =20 -static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, + struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta =3D NULL; @@ -1031,7 +1057,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str } =20 /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ - /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicat= e_seq) to default value =3D 0xffff */ + /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl + * wstart_b(indicate_seq) to default value =3D 0xffff + */ /* todo: check if AP can send A-MPDU packets */ for (i =3D 0; i < 16 ; i++) { preorder_ctrl =3D &psta->recvreorder_ctrl[i]; @@ -1048,7 +1076,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str preorder_ctrl->enable =3D false; preorder_ctrl->indicate_seq =3D 0xffff; preorder_ctrl->wend_b =3D 0xffff; - preorder_ctrl->wsize_b =3D 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_= b =3D32 */ + /* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =3D32 */ + preorder_ctrl->wsize_b =3D 64; } } } @@ -1058,7 +1087,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str =20 /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network(struct adapter *padapter, struct wl= an_network *ptarget_wlan, struct wlan_network *pnetwork) +static void rtw_joinbss_update_network(struct adapter *padapter, + struct wlan_network *ptarget_wlan, + struct wlan_network *pnetwork) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; @@ -1075,8 +1106,12 @@ static void rtw_joinbss_update_network(struct adapte= r *padapter, struct wlan_net =20 padapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sig= nal_strength; padapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_= quality; - /* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->netwo= rk.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.phy_info.signal_strength); + /* the ptarget_wlan->network.rssi is raw data, we use + * ptarget_wlan->network.phy_info.signal_strength instead (has scaled) + */ + padapter->recvpriv.rssi =3D + translate_percentage_to_dbm( + ptarget_wlan->network.phy_info.signal_strength); =20 rtw_set_signal_stat_timer(&padapter->recvpriv); =20 @@ -1098,10 +1133,13 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net break; } =20 - rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struc= t ndis_802_11_fix_ie), - (cur_network->network.ie_length)); + rtw_update_protection(padapter, + (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie), + (cur_network->network.ie_length)); =20 - rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, (u8)cur_network->network.configuration.ds_config); + rtw_update_ht_cap(padapter, cur_network->network.ies, + cur_network->network.ie_length, + (u8)cur_network->network.configuration.ds_config); } =20 static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; @@ -1183,7 +1221,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; =20 - the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, cur_network->= network.mac_address, ETH_ALEN); + the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, + cur_network->network.mac_address, ETH_ALEN); =20 pnetwork->network.length =3D get_wlan_bssid_ex_sz(&pnetwork->network); if (pnetwork->network.length > sizeof(struct wlan_bssid_ex)) @@ -1219,7 +1258,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) } =20 } else { - ptarget_wlan =3D _rtw_find_same_network(&pmlmepriv->scanned_queue, pne= twork); + ptarget_wlan =3D _rtw_find_same_network(&pmlmepriv->scanned_queue, + pnetwork); if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { if (ptarget_wlan) ptarget_wlan->fixed =3D true; @@ -1236,7 +1276,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) goto ignore_joinbss_callback; } =20 - /* s3. find ptarget_sta & update ptarget_sta after update cur_network o= nly for station mode */ + /* s3. find ptarget_sta & update ptarget_sta after update cur_network + * only for station mode + */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { ptarget_sta =3D rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { @@ -1368,8 +1410,10 @@ void rtw_stassoc_event_callback(struct adapter *adap= ter, u8 *pbuf) psta =3D rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); if (psta) { /* the sta have been in sta_info_queue =3D> do nothing */ - - return; /* between drv has received this event before and fw have not y= et to set key to CAM_ENTRY) */ + /* between drv has received this event before and fw have + * not yet to set key to CAM_ENTRY) + */ + return; } =20 psta =3D rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr); @@ -1396,7 +1440,8 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { if (adapter->stapriv.asoc_sta_count =3D=3D 2) { spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); pmlmepriv->cur_network_scanned =3D ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed =3D true; @@ -1453,16 +1498,19 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) =20 if (adapter->registrypriv.wifi_spec =3D=3D 1) { roam =3D false; - } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && rtw_chk_roam_flag= s(adapter, RTW_ROAM_ON_EXPIRED)) { + } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && + rtw_chk_roam_flags(adapter, RTW_ROAM_ON_EXPIRED)) { roam =3D true; - } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(a= dapter, RTW_ROAM_ACTIVE)) { + } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && + rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { roam =3D true; roam_target =3D pmlmepriv->roam_network; } =20 if (roam) { if (rtw_to_roam(adapter) > 0) - rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, d= ecrease to_roam */ + /* this stadel_event is caused by roaming, decrease to_roam */ + rtw_dec_to_roam(adapter); else if (rtw_to_roam(adapter) =3D=3D 0) rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times); } else { @@ -1476,7 +1524,8 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* remove the network entry in scanned_queue */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netwo= rk.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); @@ -1490,12 +1539,14 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { rtw_free_stainfo(adapter, psta); =20 - if (adapter->stapriv.asoc_sta_count =3D=3D 1) {/* a sta + bc/mc_stainfo = (not Ibss_stainfo) */ + if (adapter->stapriv.asoc_sta_count =3D=3D 1) { + /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ u8 ret =3D _SUCCESS; =20 spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* free old ibss network */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netw= ork.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); @@ -1505,9 +1556,11 @@ void rtw_stadel_event_callback(struct adapter *adapt= er, u8 *pbuf) pdev_network =3D &adapter->registrypriv.dev_network; pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_n= etwork->network)); + memcpy(pdev_network, &tgt_network->network, + get_wlan_bssid_ex_sz(&tgt_network->network)); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); =20 @@ -1578,7 +1631,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) rtw_indicate_disconnect(adapter); free_scanqueue(pmlmepriv);/* */ =20 - /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ + /* indicate disconnect for the case that join_timeout + * and check_fwstate !=3D FW_LINKED + */ rtw_cfg80211_indicate_disconnect(adapter); } =20 @@ -1627,8 +1682,9 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) =20 rtw_mlme_reset_auto_scan_int(padapter); =20 - if (pmlmepriv->auto_scan_int_ms !=3D 0 - && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { + if (pmlmepriv->auto_scan_int_ms !=3D 0 && + 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) =3D= =3D true) goto exit; @@ -1670,7 +1726,9 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_sta= tus_watchdog() */ + /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) + * in traffic_status_watchdog() + */ } =20 } else { @@ -1730,7 +1788,8 @@ static int rtw_check_roaming_candidate(struct mlme_pr= iv *mlme if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam_= scanr_exp_ms) goto exit; =20 - if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < = mlme->roam_rssi_diff_th) + if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < + mlme->roam_rssi_diff_th) goto exit; =20 if (*candidate && (*candidate)->network.rssi >=3D competitor->network.rss= i) @@ -1803,8 +1862,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme =20 /* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) { - if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th - || memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->a= ssoc_ssid.ssid_length) + if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th || + memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, + mlme->assoc_ssid.ssid_length) ) goto exit; } @@ -1922,7 +1982,8 @@ signed int rtw_set_auth(struct adapter *adapter, stru= ct security_priv *psecurity return res; } =20 -signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, signed int keyid, u8 set_tx, bool enqueue) +signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, + signed int keyid, u8 set_tx, bool enqueue) { u8 keylen; struct cmd_obj *pcmd; @@ -1997,7 +2058,8 @@ signed int rtw_set_key(struct adapter *adapter, struc= t security_priv *psecurityp } =20 /* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ui= nt in_len, uint initial_out_len) +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ui= nt in_len, + uint initial_out_len) { unsigned int ielength =3D 0; unsigned int i, j; @@ -2006,7 +2068,9 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *= in_ie, u8 *out_ie, uint in_ while (i < in_len) { ielength =3D initial_out_len; =20 - if (in_ie[i] =3D=3D 0xDD && in_ie[i + 2] =3D=3D 0x00 && in_ie[i + 3] =3D= =3D 0x50 && in_ie[i + 4] =3D=3D 0xF2 && in_ie[i + 5] =3D=3D 0x02 && i + 5 = < in_len) { /* WMM element ID and OUI */ + if (in_ie[i] =3D=3D 0xDD && in_ie[i + 2] =3D=3D 0x00 && in_ie[i + 3] =3D= =3D 0x50 && + in_ie[i + 4] =3D=3D 0xF2 && in_ie[i + 5] =3D=3D 0x02 && i + 5 < in_l= en) { + /* WMM element ID and OUI */ for (j =3D i; j < i + 9; j++) { out_ie[ielength] =3D in_ie[j]; ielength++; @@ -2129,7 +2193,8 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u ielength +=3D psecuritypriv->wps_ie_len; } else if ((authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) || (authmode =3D=3D= WLAN_EID_RSN)) { /* copy RSN or SSN */ - memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypri= v->supplicant_ie[1] + 2); + memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], + psecuritypriv->supplicant_ie[1] + 2); ielength +=3D psecuritypriv->supplicant_ie[1] + 2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } @@ -2167,7 +2232,8 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) struct security_priv *psecuritypriv =3D &adapter->securitypriv; struct wlan_network *cur_network =3D &adapter->mlmepriv.cur_network; =20 - pdev_network->privacy =3D (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0= ) ; /* adhoc no 802.1x */ + /* adhoc no 802.1x */ + pdev_network->privacy =3D (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0= ) ; =20 pdev_network->rssi =3D 0; =20 @@ -2197,14 +2263,18 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode) ; will be called in rtw_generate_ie */ + /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode) ; + * will be called in rtw_generate_ie + */ sz =3D rtw_generate_ie(pregistrypriv); =20 pdev_network->ie_length =3D sz; =20 pdev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pd= ev_network); =20 - /* notes: translate ie_length & length after assign the length to cmdsz i= n createbss_cmd(); */ + /* notes: translate ie_length & length after assign the length to cmdsz in + * createbss_cmd(); + */ /* pdev_network->ie_length =3D cpu_to_le32(sz); */ } =20 @@ -2216,7 +2286,9 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; =20 - /* todo: if you want to do something io/reg/hw setting before join_bss, p= lease add code here */ + /* todo: if you want to do something io/reg/hw setting before join_bss, + * please add code here + */ =20 pmlmepriv->num_FortyMHzIntolerant =3D 0; =20 @@ -2306,7 +2378,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8= *out_ie, uint *pout_len) } =20 /* the function is >=3D passive_level */ -unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, uint in_len, uint *pout_len, u8 channel) +unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, + uint in_len, uint *pout_len, u8 channel) { u32 ielen, out_len; enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; @@ -2387,7 +2460,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ =20 /* update default supported_mcs_set */ if (stbc_rx_enable) - ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX ST= BC One spatial stream */ + /* RX STBC One spatial stream */ + ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R); =20 set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R); =20 @@ -2453,7 +2527,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe =20 /* check Max Rx A-MPDU Size */ len =3D 0; - p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAP= ABILITY, &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAP= ABILITY, &len, + ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { pht_capie =3D (struct ieee80211_ht_cap *)(p + 2); max_ampdu_sz =3D (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_= FACTOR); @@ -2463,7 +2538,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe } =20 len =3D 0; - p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPE= RATION, &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPE= RATION, &len, + ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { /* todo: */ } @@ -2479,7 +2555,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe =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_= supported_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_R= ATE_1R); @@ -2597,7 +2674,8 @@ void _rtw_roaming(struct adapter *padapter, struct wl= an_network *tgt_network) struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 if (rtw_to_roam(padapter) > 0) { - memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); + memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, + sizeof(struct ndis_802_11_ssid)); =20 pmlmepriv->assoc_by_bssid =3D false; =20 @@ -2614,7 +2692,8 @@ void _rtw_roaming(struct adapter *padapter, struct wl= an_network *tgt_network) signed int rtw_linked_check(struct adapter *padapter) { if ((check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) =3D=3D true) || - (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTE= R_STATE) =3D=3D true)) { + (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE | + WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { if (padapter->stapriv.asoc_sta_count > 2) return true; } else { /* Station mode */ --=20 2.39.5