From nobody Sun Feb 8 12:22:41 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 C3C2C20C47E for ; Wed, 5 Feb 2025 01:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720228; cv=none; b=r9GqoSVIeGYcRxUqi451YhZUQGF6ad0nJdR3PJf4746OXtxNEf0PVg+g72b/OumWQ1hL4fux79ZEHWDqNojr6HBR9WRCsG1Yt0aFhFHheacU17DZ7a7GI1+Optqh1Fm5tiErsaILc4z64JCpaQxxsZJv0pb8ZMPt6VkBlL7eR/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720228; c=relaxed/simple; bh=PhOVZkmQLI0Ov2+c/lHD/93cAFnmjEn08IE35A/YCHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R0ZZxvsWgs4menmseiHu7j7GsB2jROymSulnZN5hrcgAD5b935JOyfxh6cIb+PvrJRPB933MI9CL2Me+F/NLtcW1vGvJhtBIfpBtLWi3qXOt4/Uemq+ZQCpKgWwKaVfRfMyx4yz/zkK6YtkME+smQZVkhqaBATOZm70PYpQQvR8= 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=BSwegiqV; arc=none smtp.client-ip=209.85.214.171 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="BSwegiqV" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-216426b0865so109369455ad.0 for ; Tue, 04 Feb 2025 17:50:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738720225; x=1739325025; 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=jDo3xHkuJJR7VmViW90AygRyML17ekq7U9suXa747ZY=; b=BSwegiqVUq1+kglBG36SM05IcOnZuYoLr6hPzbiKeL+WlGSb8l0kYrw42/TsUmTZnm 2F1obwPKhLhKwYiwRZCizh4PKUENIupSpR6c/3+6Oc/zWqzBflS831Z2cNhicpuN+O5x nI9u2Wead5JzYVSpkxIBbEwIrLWqK/R+RR2154daxCjmRAJ/nUNNRvShsOa7FJBP7HGI +ghtL1nPI4HTzzTeF4mAYx+speZKk1ee45HS/9c07v6DRx8tdH8D/i/9ib5jlpXn0wrG PN5AL1/zOMY3FliG+Fx+lmBVd79Ipb4k0QPFYcyfSJCj1dxzJ7WzhtXLiE+l90UCb2uI zhNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738720225; x=1739325025; 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=jDo3xHkuJJR7VmViW90AygRyML17ekq7U9suXa747ZY=; b=ZLsooN7pAwbNBBDG/bXzPGQ4CSoNryF7F8ypW4dHNcgz7uxTo+LnGlDXNSZZnvb1kK 6XXAsDL6u1zJS2BkDYbSsX+MvJuAJJj5N2Vx/cMvtgmRH+bdSrORXZbcOxw8cDiY5mnQ 6bsKRAD22/I9IlUaVed2snAHSJy/04Gdw/a6no3BkgmfDsG90gYGijwE2HlaRvJLq/nT MJ5/2NWp8brfLvrkBiB6JM2Bb2fvIKwrxUWsEaFIj3IVWWjzqSZlT6PVHnMR3kD7Zxzr qpvIVYa/QBD3RO6LrwvYta0dm5ue1PQJ31VbjCIfAERnYudicoN7b6nhHdbzEolWU495 2Izg== X-Forwarded-Encrypted: i=1; AJvYcCUfjqfJKU/XXwqYbbdwHDs446qGgf+ud6MaOO9/OJLWVtQBXEXiGiV4YgqMfhhtE5/IFBMIvV/KtAqEfac=@vger.kernel.org X-Gm-Message-State: AOJu0YxRjJv5xvquguru4FP032j10A5rJC5HxUZsNThdnZGGDdcC5rF3 jz6Ha8L29nOIk7KQ6b1Px28AiY+G+Fm1N3I0I14XQ7jUHq1rCQu2DV01i2LPn5g= X-Gm-Gg: ASbGncs007kydrwT/r/Y9n18dNIJSRcRFAxVmFIKZHnYuSuudxns9s0oVEE8/wVFJw5 oKk8V/X0z/GPqXYVR+qv7YBhj7fAt9efnAZEYxPFVBpRyXlh7vx/TnWbyeEUh3MLNnqWfzTMUUX nysMuidwdgclzedDUdA55PchbgbGNFTDd46d+D+KlbVsbZObuozlYICZNPl29PlsY+4wZ3WOoIO U+s6Df1db6uNpo/JAvIY3h/QwE/GSHmtRmmHOBQqKwPi5Xz7RNoZ4AnUAfeBNnVdxe3S2RXYrHS QEZR46NUQnnarQKMmXYHFQ4= X-Google-Smtp-Source: AGHT+IE44zyc9SI0gwK+1LjnZGp+epmaEKMy8McyTJJqCr+om2RWBcFQnnZHaJN1/AQjMPxLggzF1A== X-Received: by 2002:a17:903:2d2:b0:21f:55e:ed71 with SMTP id d9443c01a7336-21f17dde150mr20781685ad.5.1738720224853; Tue, 04 Feb 2025 17:50:24 -0800 (PST) Received: from DESKTOP-GL3U3CJ ([146.70.174.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f19361d47sm2317545ad.209.2025.02.04.17.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:50:24 -0800 (PST) From: Ian To To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ian To Subject: [PATCH 1/4] staging: rtl8723bs: remove unnecessary parentheses Date: Tue, 4 Feb 2025 17:50:16 -0800 Message-ID: X-Mailer: git-send-email 2.45.3 In-Reply-To: References: 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" Removed unnecessary parentheses present in file. Signed-off-by: Ian To --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 159 +++++++++++----------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 5ded183aa08c..5fbae82ddc72 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -119,7 +119,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv= *pmlmepriv) pnetwork =3D NULL; goto exit; } - plist =3D get_next(&(free_queue->queue)); + plist =3D get_next(&free_queue->queue); =20 pnetwork =3D container_of(plist, struct wlan_network, list); =20 @@ -141,7 +141,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor { unsigned int delta_time; u32 lifetime =3D SCANQUEUE_LIFETIME; - struct __queue *free_queue =3D &(pmlmepriv->free_bss_pool); + struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; =20 if (!pnetwork) return; @@ -161,17 +161,16 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, s= truct wlan_network *pnetwor =20 spin_lock_bh(&free_queue->lock); =20 - list_del_init(&(pnetwork->list)); + list_del_init(&pnetwork->list); =20 - list_add_tail(&(pnetwork->list), &(free_queue->queue)); + list_add_tail(&pnetwork->list, &free_queue->queue); =20 spin_unlock_bh(&free_queue->lock); } =20 void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_net= work *pnetwork) { - - struct __queue *free_queue =3D &(pmlmepriv->free_bss_pool); + struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; =20 if (!pnetwork) return; @@ -404,7 +403,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(&(p= adapter->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; @@ -440,29 +440,31 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, =20 static void update_current_network(struct adapter *adapter, struct wlan_bs= sid_ex *pnetwork) { - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 - rtw_bug_check(&(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network)); + rtw_bug_check(&pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, + &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))) { - update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, tru= e); - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length); + 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 + + sizeof(struct ndis_802_11_fix_ie), + pmlmepriv->cur_network.network.ie_length); } } =20 /* -Caller must hold pmlmepriv->lock first. -*/ + *Caller must hold pmlmepriv->lock first. + */ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid= _ex *target) { struct list_head *plist, *phead; u32 bssid_ex_sz; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); - struct __queue *queue =3D &(pmlmepriv->scanned_queue); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *oldest =3D NULL; int target_find =3D 0; @@ -475,7 +477,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t =20 rtw_bug_check(pnetwork, pnetwork, pnetwork, pnetwork); =20 - if (is_same_network(&(pnetwork->network), target, feature)) { + if (is_same_network(&pnetwork->network, target, feature)) { target_find =3D 1; break; } @@ -492,14 +494,14 @@ void rtw_update_scanned_network(struct adapter *adapt= er, struct wlan_bssid_ex *t /* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ if (!target_find) { - if (list_empty(&pmlmepriv->free_bss_pool.queue)) { + if (list_empty & pmlmepriv->free_bss_pool.queue) { /* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork =3D oldest; if (!pnetwork) goto exit; =20 - memcpy(&(pnetwork->network), target, get_wlan_bssid_ex_sz(target)); + memcpy(&pnetwork->network, target, get_wlan_bssid_ex_sz(target)); /* variable initialize */ pnetwork->fixed =3D false; pnetwork->last_scanned =3D jiffies; @@ -521,7 +523,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t =20 bssid_ex_sz =3D get_wlan_bssid_ex_sz(target); target->length =3D bssid_ex_sz; - memcpy(&(pnetwork->network), target, bssid_ex_sz); + memcpy(&pnetwork->network, target, bssid_ex_sz); =20 pnetwork->last_scanned =3D jiffies; =20 @@ -529,8 +531,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t if (pnetwork->network.phy_info.signal_quality =3D=3D 101) pnetwork->network.phy_info.signal_quality =3D 0; =20 - list_add_tail(&(pnetwork->list), &(queue->queue)); - + list_add_tail(&pnetwork->list, &queue->queue); } } else { /* we have an entry and we are going to update it. But this entry may @@ -553,7 +554,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t update_ie =3D false; } =20 - update_network(&(pnetwork->network), target, adapter, update_ie); + update_network(&pnetwork->network, target, adapter, update_ie); } =20 exit: @@ -629,7 +630,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) { u32 len; struct wlan_bssid_ex *pnetwork; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 pnetwork =3D (struct wlan_bssid_ex *)pbuf; =20 @@ -645,14 +646,15 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *pbuf) 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); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); + 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)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto exit; } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); } } =20 @@ -670,7 +672,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) =20 void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 spin_lock_bh(&pmlmepriv->lock); if (pmlmepriv->wps_probe_req_ie) { @@ -697,7 +699,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, 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_net= work; u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ @@ -922,8 +924,8 @@ inline void rtw_indicate_scan_done(struct adapter *pada= pter, bool aborted) void rtw_scan_abort(struct adapter *adapter) { unsigned long start; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); - struct mlme_ext_priv *pmlmeext =3D &(adapter->mlmeextpriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 start =3D jiffies; pmlmeext->scan_abort =3D true; @@ -1029,8 +1031,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str /* 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) { - struct mlme_priv *pmlmepriv =3D &(padapter->mlmepriv); - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 /* why not use ptarget_wlan?? */ memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.lengt= h); @@ -1086,9 +1088,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) static u8 __maybe_unused retry; struct sta_info *ptarget_sta =3D NULL, *pcur_sta =3D NULL; struct sta_priv *pstapriv =3D &adapter->stapriv; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct wlan_network *pnetwork =3D (struct wlan_network *)pbuf; - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; =20 @@ -1106,7 +1108,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; =20 if (pnetwork->join_res > 0) { - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); retry =3D 0; if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { /* s1. find ptarget_wlan */ @@ -1143,7 +1145,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) } else { netdev_dbg(adapter->pnetdev, "Can't find ptarget_wlan when joinbss_event callback\n"); - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; } =20 @@ -1151,7 +1153,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { ptarget_sta =3D rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; } } @@ -1169,7 +1171,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) del_timer_sync(&pmlmepriv->assoc_timer); spin_lock_bh(&pmlmepriv->lock); } else { - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); } } else if (pnetwork->join_res =3D=3D -4) { rtw_reset_securitypriv(adapter); @@ -1226,16 +1228,16 @@ void rtw_sta_media_status_rpt(struct adapter *adapt= er, struct sta_info *psta, u3 if (!psta) return; =20 - media_status_rpt =3D (u16)((psta->mac_id<<8)|mstatus); /* MACID|OPMODE:= 1 connect */ + media_status_rpt =3D (u16)((psta->mac_id << 8) | mstatus); /* MACID|OPM= ODE:1 connect */ rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_stat= us_rpt); } =20 void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) { struct sta_info *psta; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct stassoc_event *pstassoc =3D (struct stassoc_event *)pbuf; - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *ptarget_wlan =3D NULL; =20 if (rtw_access_ctrl(adapter, pstassoc->macaddr) =3D=3D false) @@ -1306,12 +1308,12 @@ void rtw_stassoc_event_callback(struct adapter *ada= pter, u8 *pbuf) if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || (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)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); pmlmepriv->cur_network_scanned =3D ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed =3D true; - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ rtw_indicate_connect(adapter); } @@ -1329,11 +1331,11 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) struct wlan_network *pwlan =3D NULL; struct wlan_bssid_ex *pdev_network =3D NULL; u8 *pibss =3D NULL; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct stadel_event *pstadel =3D (struct stadel_event *)pbuf; - struct wlan_network *tgt_network =3D &(pmlmepriv->cur_network); + struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 psta =3D rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr); if (psta) @@ -1385,14 +1387,14 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); =20 - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + 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); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); =20 _rtw_roaming(adapter, roam_target); } @@ -1404,16 +1406,17 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) =20 if (adapter->stapriv.asoc_sta_count =3D=3D 1) {/* a sta + bc/mc_stainfo = (not Ibss_stainfo) */ u8 ret =3D _SUCCESS; - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + + 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); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); /* re-create ibss */ - pdev_network =3D &(adapter->registrypriv.dev_network); + 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)); @@ -1521,7 +1524,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *ada= pter) { struct mlme_priv *mlme =3D &adapter->mlmepriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 if (pmlmeinfo->VHT_enable) /* disable auto scan when connect to 11AC AP */ mlme->auto_scan_int_ms =3D 0; @@ -1662,7 +1665,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *ml= me) { int ret =3D _FAIL; struct list_head *phead; - struct __queue *queue =3D &(mlme->scanned_queue); + struct __queue *queue =3D &mlme->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; =20 @@ -1671,16 +1674,14 @@ int rtw_select_roaming_candidate(struct mlme_priv *= mlme) return ret; } =20 - spin_lock_bh(&(mlme->scanned_queue.lock)); + spin_lock_bh(&mlme->scanned_queue.lock); phead =3D get_list_head(queue); =20 list_for_each(mlme->pscanned, phead) { - pnetwork =3D list_entry(mlme->pscanned, struct wlan_network, list); =20 rtw_check_roaming_candidate(mlme, &candidate, pnetwork); - } =20 if (!candidate) { @@ -1695,7 +1696,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *ml= me) =20 ret =3D _SUCCESS; exit: - spin_unlock_bh(&(mlme->scanned_queue.lock)); + spin_unlock_bh(&mlme->scanned_queue.lock); =20 return ret; } @@ -1745,24 +1746,24 @@ static int rtw_check_join_candidate(struct mlme_pri= v *mlme } =20 /* -Calling context: -The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock -*/ + *Calling context: + *The caller of the sub-routine will be in critical section... + *The caller must hold the following spinlock + *pmlmepriv->lock + */ =20 int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) { int ret; struct list_head *phead; struct adapter *adapter; - struct __queue *queue =3D &(pmlmepriv->scanned_queue); + struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; =20 adapter =3D (struct adapter *)pmlmepriv->nic_hdl; =20 - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); =20 if (pmlmepriv->roam_network) { candidate =3D pmlmepriv->roam_network; @@ -1800,7 +1801,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlm= e_priv *pmlmepriv) ret =3D rtw_joinbss_cmd(adapter, candidate); =20 exit: - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); return ret; } =20 @@ -1808,7 +1809,7 @@ signed int rtw_set_auth(struct adapter *adapter, stru= ct security_priv *psecurity { struct cmd_obj *pcmd; struct setauth_parm *psetauthparm; - struct cmd_priv *pcmdpriv =3D &(adapter->cmdpriv); + struct cmd_priv *pcmdpriv =3D &adapter->cmdpriv; signed int res =3D _SUCCESS; =20 pcmd =3D rtw_zmalloc(sizeof(struct cmd_obj)); @@ -1840,12 +1841,13 @@ signed int rtw_set_auth(struct adapter *adapter, st= ruct 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; struct setkey_parm *psetkeyparm; - struct cmd_priv *pcmdpriv =3D &(adapter->cmdpriv); + struct cmd_priv *pcmdpriv =3D &adapter->cmdpriv; signed int res =3D _SUCCESS; =20 psetkeyparm =3D rtw_zmalloc(sizeof(struct setkey_parm)); @@ -1865,14 +1867,13 @@ signed int rtw_set_key(struct adapter *adapter, str= uct security_priv *psecurityp adapter->securitypriv.key_mask |=3D BIT(psetkeyparm->keyid); =20 switch (psetkeyparm->algorithm) { - case _WEP40_: keylen =3D 5; - memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[= 0]), keylen); + memcpy(&psetkeyparm->key[0], &psecuritypriv->dot11DefKey[keyid].skey[0],= keylen); break; case _WEP104_: keylen =3D 13; - memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[= 0]), keylen); + memcpy(&psetkeyparm->key[0], &psecuritypriv->dot11DefKey[keyid].skey[0],= keylen); break; case _TKIP_: keylen =3D 16; @@ -2035,7 +2036,7 @@ void rtw_init_registrypriv_dev_network(struct adapter= *adapter) { struct registry_priv *pregistrypriv =3D &adapter->registrypriv; struct eeprom_priv *peepriv =3D &adapter->eeprompriv; - struct wlan_bssid_ex *pdev_network =3D &pregistrypriv->dev_network; + struct wlan_bssid_ex *pdev_network =3D &pregistrypriv->dev_network; u8 *myhwaddr =3D myid(peepriv); =20 memcpy(pdev_network->mac_address, myhwaddr, ETH_ALEN); @@ -2335,7 +2336,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 cbw40_enable =3D 0; =20 if (!phtpriv->ht_option) --=20 2.45.3 From nobody Sun Feb 8 12:22:41 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 DA15120E014 for ; Wed, 5 Feb 2025 01:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720228; cv=none; b=a69am4j+kaQ6vip3hvSBGQPkzpIMd1logeU8INyn3BQ9xcv7gC4nNupoCe1O9EdeEiGGZgNeD94pXa+ddZ8ayHuxoFmEhcShbkvGBWLzL0LGPtw9ZGXV0uiaj898PEj1+LqjqB7QY8hz9iH7AI75Z8Qp/gISwK8gDtM/CeKtmLI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720228; c=relaxed/simple; bh=U7EjI4mmZ1iOFRRE6EMeYiJgbg/RfoLqZiujeP9G7Ng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMtsAkKLbjldmFmd0wCCJCUFpJLkTGimf7dNj4xHIPoR9ayqhOkXvhqp8ASMuJ6pY8a7B4bndp5RjsR0fxqAcIgHvJ3JEcMsrEWNjA1rb4tuu94oEafHSGUmwd/bt3XXNqCYYIB3EiRi4quulvD+0uVk0grWxjrvzsF6KZotJ30= 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=EfaPOjeB; arc=none smtp.client-ip=209.85.214.174 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="EfaPOjeB" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21c2f1b610dso148205315ad.0 for ; Tue, 04 Feb 2025 17:50:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738720226; x=1739325026; 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=3XyNMfxY5YoMNmSd3BdK4HA6mtOMD2456Zcbxpy+7YM=; b=EfaPOjeBauS30va0kXYtqZ5MxLk0hb8to+DbZ88STpe3PJ8IUUSa+c/UF/8S0Jv9BQ nDxZiBlDY5DPlJ13IM6fiYeSBivUzSyqm6R5I8jdif4iY0Czy7d5VQRN1IlLOAZ2TgUt /wS1Mbf11bD9WolyQV0F/zphrFUW1ZOIfXfrlPEOc/R14MOJ4BTwgZVkkAsoUdP5Kf+u 2qp32ZbQMabkbhXRhsJbJlzr0kcbvcvNLs/iVBlX3V1U6KLG0710DjJy7DNpi3yqrDLS JrfKE7Vbn1KU8SWFK3Z/ubqKLr5dGWv48J/14NtmFezVZYEoMFsw+64DTATSCZJRNMDd qxlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738720226; x=1739325026; 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=3XyNMfxY5YoMNmSd3BdK4HA6mtOMD2456Zcbxpy+7YM=; b=jjUODpytTZanZ/ttuzv2gwi+wziJmo4WW2uxwEpIO+YIU62FRioYHruJHnzm2jaNq+ 9i5MZ3v+mAJgTEmrua4vDGAGKiW/iGL1PjgOFLa48T8vzPNhRlH+Ei/yZ/j58Sa0E1rn XgmVto4ypVvfgIT1s4HYGb/p7QPaBQFcEDyFsvIGTf4gep8Gj0ghYwwGP9qX4/gPFsl2 6X7oA3t5LWt+Yc54mwdU5p9eeAlVBgwrglDXBjzO0UaWeqSt1Kml912ru6H5VxvZnGDn zUn9uW/abaSi2ROXxrYRVXSDXw0KLhRHErEhMgrXXP2bzYsc+gXZ5CLxBZg+sL3H8qaa l6Cw== X-Forwarded-Encrypted: i=1; AJvYcCUBgjHRqsC7AH4307MOgzsvcElTFgti1nJNFNFvYqfbifXc59ZxLwDSz6YriByw9ECcJYV2UxKMLVMvHM4=@vger.kernel.org X-Gm-Message-State: AOJu0YyZD95pzzuqh/TkwxTVq+EsR9+RC4T5+IGLuOe2Pq7AK3FXhPoE PbA/QWZwwuzpfE+IZeusiFnatITvl6kk25kIXamAhiaTgiqif64W X-Gm-Gg: ASbGncufJoniudxaRVnbmyJUV3b4F4WBcKPcRm9/F8+cs53gUOQDccaLQZNwNfwUhm9 dYUUTiZzOI2qzmISy1QKZw+Ub5bu8uDT6LkbDWG1XgLQ/NM9dj8+f5xPgIim1rTGUNcFkbLQIDI TNMGyPJ1rvOPAsfFcMhDFTmKTSQ7YaL484cD3kGThMosWnednS4XuW1sWQMy4KPBHumUEeBMc6N iKpgK0PI7jJIKvWkzxX3fH6vtlblKIzZghPXMZh/ChvIhx8pBkoRfqhStcdWrq4XRSlM6gmC1Gh qWxO8cWSINvjb4OodF+Olbg= X-Google-Smtp-Source: AGHT+IE/qLeJ8FQFICj88GuBYdjWkkVl43CPEpFozLtnuR1zrVDN5MnzN6OeAvgw2X6055gFO0kyBw== X-Received: by 2002:a17:903:2383:b0:21f:baa:80c1 with SMTP id d9443c01a7336-21f17eee758mr21208345ad.53.1738720226113; Tue, 04 Feb 2025 17:50:26 -0800 (PST) Received: from DESKTOP-GL3U3CJ ([146.70.174.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f01d19457sm23585635ad.153.2025.02.04.17.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:50:25 -0800 (PST) From: Ian To To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ian To Subject: [PATCH 2/4] staging: rtl8723bs: break up long lines Date: Tue, 4 Feb 2025 17:50:17 -0800 Message-ID: X-Mailer: git-send-email 2.45.3 In-Reply-To: References: 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" Long lines were broken up into smaller ones to comply with coding style. Signed-off-by: Ian To --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 135 +++++++++++++--------- 1 file changed, 82 insertions(+), 53 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 5fbae82ddc72..e33f37f71d92 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -95,7 +95,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepr= iv) 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 @@ -178,9 +179,9 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepr= iv, struct wlan_network * if (pnetwork->fixed) return; =20 - list_del_init(&(pnetwork->list)); + list_del_init(&pnetwork->list); =20 - list_add_tail(&(pnetwork->list), get_list_head(free_queue)); + list_add_tail(&pnetwork->list, get_list_head(free_queue)); } =20 /* @@ -286,7 +287,7 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { - _rtw_free_network_nolock(&(padapter->mlmepriv), pnetwork); + _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); rtw_cfg80211_unlink_bss(padapter, pnetwork); } =20 @@ -347,10 +348,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct= wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap & WLAN_CAPABILITY_ESS) =3D=3D (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; @@ -588,11 +589,12 @@ int rtw_is_desired_network(struct adapter *adapter, s= truct 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->ne= twork.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; - } if (adapter->registrypriv.wifi_spec =3D=3D 1) { /* for correct flow of 8= 021X to do.... */ u8 *p =3D NULL; @@ -602,7 +604,8 @@ 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_R= SN, + &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) bselected =3D true; else @@ -614,7 +617,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 @@ -642,7 +646,8 @@ void rtw_survey_event_callback(struct adapter *adapter,= 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= _address, 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); @@ -705,7 +710,8 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) /* 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); @@ -732,8 +738,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); @@ -749,10 +756,11 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) } } else { if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) - && check_fwstate(pmlmepriv, _FW_LINKED)) { + 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 + receive_disconnect(adapter, + pmlmepriv->cur_network.network.mac_address , WLAN_REASON_ACTIVE_ROAM); } } @@ -893,8 +901,8 @@ void rtw_indicate_disconnect(struct adapter *padapter) if (rtw_to_roam(padapter) > 0) _clr_fwstate_(pmlmepriv, _FW_LINKED); =20 - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) - || (rtw_to_roam(padapter) <=3D 0) + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || + (rtw_to_roam(padapter) <=3D 0) ) { rtw_os_indicate_disconnect(padapter); =20 @@ -929,9 +937,8 @@ void rtw_scan_abort(struct adapter *adapter) =20 start =3D jiffies; pmlmeext->scan_abort =3D true; - while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) - && jiffies_to_msecs(start) <=3D 200) { - + while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && + jiffies_to_msecs(start) <=3D 200) { if (adapter->bDriverStopped || adapter->bSurpriseRemoved) break; =20 @@ -944,7 +951,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; @@ -1029,7 +1037,8 @@ 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 wl= an_network *ptarget_wlan, + struct wlan_network *pnetwork) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; @@ -1069,10 +1078,12 @@ 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->networ= k.ie_length, + (u8)cur_network->network.configuration.ds_config); } =20 /* Notes: the function could be > passive_level (the same context as Rx ta= sklet) */ @@ -1096,7 +1107,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) =20 rtw_get_encrypt_decrypt_from_registrypriv(adapter); =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)) @@ -1114,9 +1126,11 @@ void rtw_joinbss_event_prehandle(struct adapter *ada= pter, u8 *pbuf) /* s1. find ptarget_wlan */ if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (the_same_macaddr) { - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_netw= ork->network.mac_address); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); } else { - pcur_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_network= ->network.mac_address); + pcur_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); if (pcur_wlan) pcur_wlan->fixed =3D false; =20 @@ -1366,9 +1380,11 @@ void rtw_stadel_event_callback(struct adapter *adapt= er, 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; } @@ -1409,7 +1425,8 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) =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); @@ -1419,9 +1436,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 @@ -1543,9 +1562,8 @@ 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->a= uto_scan_int_ms) { if (!padapter->registrypriv.wifi_spec) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) =3D= =3D true) goto exit; @@ -1575,8 +1593,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) if (adapter->net_closed) return; =20 - if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps(adapter)) + if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) && + !(hal_btcoex_IsBtControlLps(adapter)) ) { u8 bEnterPS; =20 @@ -1647,7 +1665,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) @@ -1720,8 +1739,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; } @@ -1730,8 +1750,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme goto exit; =20 if (rtw_to_roam(adapter) > 0) { - if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam= _scanr_exp_ms - || is_same_ess(&competitor->network, &mlme->cur_network.network) =3D=3D= false + if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D + mlme->roam_scanr_exp_ms || + is_same_ess(&competitor->network, &mlme->cur_network.network) =3D=3D= false ) goto exit; } @@ -1917,7 +1938,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; @@ -1926,7 +1948,8 @@ 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++; @@ -2017,8 +2040,9 @@ 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); - ielength +=3D psecuritypriv->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); } =20 @@ -2198,7 +2222,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; @@ -2351,7 +2376,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_CAPAB= ILITY, &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); @@ -2362,7 +2388,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_OPERA= TION, &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: */ } @@ -2495,13 +2522,15 @@ void rtw_roaming(struct adapter *padapter, struct w= lan_network *tgt_network) _rtw_roaming(padapter, tgt_network); spin_unlock_bh(&pmlmepriv->lock); } + void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_netwo= rk) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; 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 --=20 2.45.3 From nobody Sun Feb 8 12:22:41 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 6A3AB21128F for ; Wed, 5 Feb 2025 01:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720230; cv=none; b=X1AtyfCFnyHTbBEDCPjte/Hb78Fo33AAXvZpv8DIqcBp8KtTys4R3oyCB5dHYdujSuJ7ODvOTV36iHrOfmWW4Og0eFzw1BCiiXosD2Y8dCzSB39Efxp34Q6kxxLlycPkXHAtEQyaAbQCb7GpW8mR5AW7e+KE1xqffwh8iUOhkb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720230; c=relaxed/simple; bh=c2VTN2W1nRF0pZZq+dlOuESRn5VnZB/1yQJjq13S4s4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hp+QrZsro5nRo2tWAdTj2ZWz/oKNZ+qnur2JqYeub5hvQrL47rCsmvQu0S9njp4FnaAlHdrlg4VuYgDSUcpJKD4DjN2bV3l2NINQrBKmxHeWrFb99ofhJDH4enaz+CMooArk9v1mU5pc826rZHr5dn18F1cR+0DmvgPvpHLDNO0= 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=TGwlqzRE; arc=none smtp.client-ip=209.85.214.173 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="TGwlqzRE" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f0bc811dbso5286595ad.1 for ; Tue, 04 Feb 2025 17:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738720228; x=1739325028; 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=ZSX8ryuK3S8lNUicFwqniT9eS96hC7AK+sPyMLhyXhU=; b=TGwlqzREAARrmvjfVHjOXTOpkgYJ/XRkNQ+sSZuzcge8N+KlMeSmSmtrvhNwuVOLHm ZJT9ZfCONSQk2ZTr3UfcDvnZuCNc9OrSkNa5Bdbw5getBroNDQjcptzh7HhE74IRw5UR 8aIZe+eaBDlGeqlsUn38FCpeM6/YTVpB6XxTGxqEL20+vga60AbcIpCQyKDZ61BfEtp2 +ahgMgP1g/VsBoveMo73qg8NSyHpirCVs9DXOjN7CWoXBjZQ8ZsyvGkbDuSn7gFXiQkt Q6q5dteyn3el76vVNNtecintaIzdCz33qsjM1dSyAqbQYpUHVE05Zn9yf3nkn/5sfq0G If7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738720228; x=1739325028; 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=ZSX8ryuK3S8lNUicFwqniT9eS96hC7AK+sPyMLhyXhU=; b=ifyQ6Ji6fl7g+DEo3ASu0ckLqzlMexyJlceHlJ4MxAicfDass7Jc55RtvKil80eYPn pPP3b0W/aLaQRmFku/NHc0VrDGIax38J/ZrXdhydg0YEt+f7RrfMgdoGV7bnDNpnK+iT qUgJPTpRtaI7gmIu7jWeM4zQrHOqZezVsf6kkLVEQZAdO5FRXESImi9ci9Xr/xoPFAsj v8sU4dztNEIO2u5yfyKmRSQ/7v0AwtllK/DJmAVHDhuvzMZREbzdA0Uu1u/Wy/F7sHgO ObXnr2JNvQJ1vsrGNE/nl2IrIvvk95pti3CO0BLwhEEZrLdv9IdtkF7HgYY1mtM3RYvk LyMg== X-Forwarded-Encrypted: i=1; AJvYcCU5sbR0OErFnRzGPP9AgKZYPrzVCp542LLU9PGapyBwUyEAKrmUpN2noWrK2x/kQs85PKhf20pbfcM8O4I=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9qJh8q4A+m3lKVIvEAaYXRhg7qVno2INyMbn5StJv8uiPhdZr 2KnrecsRWS9RHxpiqsdH4snD4IcJ4PnHhWZahNTpe5W9Y9HQyBMW X-Gm-Gg: ASbGncs+isDGkLY6+o+QQpcOMcMIGhsOUomQonxnJatg9j+m0dnszw2bf468mLefYgy dAX8amboTbugaYtKzkxE5CdA+/QA/6C1P8zNlqlwjWWenr3Ide0tP5AKtvcNTk30scgxB2qLXuj KswOc6qJoaMuj6JjctTsHZDsOEhNGgBgvXnsW96ckk2jqv7nQcqS+IMPXeGdi7Nw8gI18F0se+H 8PiE9G2zsoZ2qb+AlPsMpER2vEv1pknTq9Kr7ZshH8dP0tWrZhEvEnEuF4HzqP7un4GNbY4yLQd lRvfE9JRtU3B9604/CIk0mM= X-Google-Smtp-Source: AGHT+IFiFvSYxcg0SM88lbp3FidV8ium9N04sA3SYMiW6rmtm7x9jnQ1lUa40c1gsBsqlzVSaHfKFw== X-Received: by 2002:a05:6a20:3d81:b0:1e1:b0e8:11dc with SMTP id adf61e73a8af0-1ede8344fe0mr1691167637.21.1738720227625; Tue, 04 Feb 2025 17:50:27 -0800 (PST) Received: from DESKTOP-GL3U3CJ ([146.70.174.231]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acebe94af26sm9118495a12.45.2025.02.04.17.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:50:27 -0800 (PST) From: Ian To To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ian To Subject: [PATCH 3/4] staging: rtl8723bs: fix spacing issues Date: Tue, 4 Feb 2025 17:50:18 -0800 Message-ID: <31e556ebf3b356e604b9c72122b031c1a91e20dd.1738720049.git.onlyian4981@gmail.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: References: 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" Spacing was not compliant with the coding style. Signed-off-by: Ian To --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 110 +++++++++------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index e33f37f71d92..4d8dc7646867 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -151,7 +151,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor return; =20 if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) lifetime =3D 1; =20 if (!isfreeall) { @@ -225,11 +225,9 @@ void rtw_free_network_queue(struct adapter *padapter, = u8 isfreeall) =20 phead =3D get_list_head(scanned_queue); list_for_each_safe(plist, tmp, phead) { - pnetwork =3D list_entry(plist, struct wlan_network, list); =20 _rtw_free_network(pmlmepriv, pnetwork, isfreeall); - } =20 spin_unlock_bh(&scanned_queue->lock); @@ -240,7 +238,7 @@ signed int rtw_if_up(struct adapter *padapter) signed int res; =20 if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate(&padapter->mlmepriv, _FW_LINKED) =3D=3D false)) + (check_fwstate(&padapter->mlmepriv, _FW_LINKED) =3D=3D false)) res =3D false; else res =3D true; @@ -256,8 +254,8 @@ void rtw_generate_random_ibss(u8 *pibss) pibss[1] =3D 0x11; pibss[2] =3D 0x87; pibss[3] =3D (u8)(curtime & 0xff) ;/* p[0]; */ - pibss[4] =3D (u8)((curtime>>8) & 0xff) ;/* p[1]; */ - pibss[5] =3D (u8)((curtime>>16) & 0xff) ;/* p[2]; */ + pibss[4] =3D (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ + pibss[5] =3D (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ } =20 u8 *rtw_get_capability_from_ie(u8 *ie) @@ -309,7 +307,7 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wl= an_network *pnetwork) struct security_priv *psecuritypriv =3D &adapter->securitypriv; =20 if ((psecuritypriv->dot11PrivacyAlgrthm !=3D _NO_PRIVACY_) && - (pnetwork->network.privacy =3D=3D 0)) + (pnetwork->network.privacy =3D=3D 0)) ret =3D false; else if ((psecuritypriv->dot11PrivacyAlgrthm =3D=3D _NO_PRIVACY_) && (pnetwork->network.privacy =3D=3D 1)) @@ -318,13 +316,12 @@ int rtw_is_same_ibss(struct adapter *adapter, struct = wlan_network *pnetwork) ret =3D true; =20 return ret; - } =20 inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b) { - return (a->ssid.ssid_length =3D=3D b->ssid.ssid_length) - && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); + return (a->ssid.ssid_length =3D=3D b->ssid.ssid_length) && + !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); } =20 int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, = u8 feature) @@ -380,7 +377,6 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct= __queue *scanned_queue) phead =3D get_list_head(scanned_queue); =20 list_for_each(plist, phead) { - pwlan =3D list_entry(plist, struct wlan_network, list); =20 if (!pwlan->fixed) { @@ -389,11 +385,10 @@ struct wlan_network *rtw_get_oldest_wlan_network(stru= ct __queue *scanned_queue) } } return oldest; - } =20 void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, - struct adapter *padapter, bool update_ie) + struct adapter *padapter, bool update_ie) { long rssi_ori =3D dst->rssi; =20 @@ -411,21 +406,20 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, sq_final =3D padapter->recvpriv.signal_qual; /* the rssi value here is undecorated, and will be used for antenna dive= rsity */ if (sq_smp !=3D 101) /* from the right channel */ - rssi_final =3D (src->rssi+dst->rssi*4)/5; + rssi_final =3D (src->rssi + dst->rssi * 4) / 5; else 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_info.= signal_strength)*4)/5; - sq_final =3D ((u32)(src->phy_info.signal_quality)+(u32)(dst->phy_info.s= ignal_quality)*4)/5; - rssi_final =3D (src->rssi+dst->rssi*4)/5; + 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; + 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 */ ss_final =3D dst->phy_info.signal_strength; sq_final =3D dst->phy_info.signal_quality; rssi_final =3D dst->rssi; } - } =20 if (update_ie) { @@ -842,14 +836,14 @@ void rtw_free_assoc_resources(struct adapter *adapter= , int lock_scanned_queue) struct dvobj_priv *psdpriv =3D adapter->dvobj; struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) { + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE)) { struct sta_info *psta; =20 psta =3D rtw_get_stainfo(&adapter->stapriv, tgt_network->network.mac_add= ress); rtw_free_stainfo(adapter, psta); } =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE|WIF= I_AP_STATE)) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE |= WIFI_AP_STATE)) { struct sta_info *psta; =20 rtw_free_all_stainfo(adapter); @@ -878,7 +872,6 @@ void rtw_indicate_connect(struct adapter *padapter) pmlmepriv->to_join =3D false; =20 if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_LINKED); =20 rtw_os_indicate_connect(padapter); @@ -886,7 +879,6 @@ void rtw_indicate_connect(struct adapter *padapter) =20 rtw_set_to_roam(padapter, 0); rtw_set_scan_deny(padapter, 3000); - } =20 /* @@ -896,7 +888,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS); + _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); =20 if (rtw_to_roam(padapter) > 0) _clr_fwstate_(pmlmepriv, _FW_LINKED); @@ -923,7 +915,7 @@ inline void rtw_indicate_scan_done(struct adapter *pada= pter, bool aborted) =20 if ((!adapter_to_pwrctl(padapter)->bInSuspend) && (!check_fwstate(&padapter->mlmepriv, - WIFI_ASOC_STATE|WIFI_UNDER_LINKING))) { + WIFI_ASOC_STATE | WIFI_UNDER_LINKING))) { rtw_set_ips_deny(padapter, 0); _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 1); } @@ -1032,7 +1024,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, } =20 return psta; - } =20 /* pnetwork : returns from rtw_joinbss_event_callback */ @@ -1064,8 +1055,8 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net switch (pnetwork->network.infrastructure_mode) { case Ndis802_11Infrastructure: =20 - if (pmlmepriv->fw_state&WIFI_UNDER_WPS) - pmlmepriv->fw_state =3D WIFI_STATION_STATE|WIFI_UNDER_WPS; + if (pmlmepriv->fw_state & WIFI_UNDER_WPS) + pmlmepriv->fw_state =3D WIFI_STATION_STATE | WIFI_UNDER_WPS; else pmlmepriv->fw_state =3D WIFI_STATION_STATE; =20 @@ -1320,7 +1311,7 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) spin_lock_bh(&pmlmepriv->lock); =20 if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { + (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); @@ -1360,13 +1351,13 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) if (mac_id >=3D 0) { u16 media_status; =20 - media_status =3D (mac_id<<8)|0; /* MACID|OPMODE:0 means disconnect */ + media_status =3D (mac_id << 8) | 0; /* MACID|OPMODE:0 means disconnect= */ /* for STA, AP, ADHOC mode, report disconnect stauts to FW */ rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_sta= tus); } =20 /* if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) */ - if ((pmlmeinfo->state&0x03) =3D=3D WIFI_FW_AP_STATE) + if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) return; =20 mlmeext_sta_del_event_callback(adapter); @@ -1416,8 +1407,7 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) } =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - + 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) */ @@ -1455,7 +1445,6 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) if (ret !=3D _SUCCESS) goto unlock; } - } =20 unlock: @@ -1548,7 +1537,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *ada= pter) if (pmlmeinfo->VHT_enable) /* disable auto scan when connect to 11AC AP */ mlme->auto_scan_int_ms =3D 0; else if (adapter->registrypriv.wifi_spec && is_client_associated_to_ap(ad= apter) =3D=3D true) - mlme->auto_scan_int_ms =3D 60*1000; + mlme->auto_scan_int_ms =3D 60 * 1000; else if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { if (check_fwstate(mlme, WIFI_STATION_STATE) && check_fwstate(mlme, _FW_L= INKED)) mlme->auto_scan_int_ms =3D mlme->roam_scan_int_ms; @@ -1794,12 +1783,10 @@ int rtw_select_and_join_from_scanned_queue(struct m= lme_priv *pmlmepriv) =20 phead =3D get_list_head(queue); list_for_each(pmlmepriv->pscanned, phead) { - pnetwork =3D list_entry(pmlmepriv->pscanned, struct wlan_network, list); =20 rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); - } =20 if (!candidate) { @@ -1961,11 +1948,10 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8= *in_ie, u8 *out_ie, uint in_ break; } =20 - i +=3D (in_ie[i+1]+2); /* to the next IE element */ + i +=3D (in_ie[i + 1] + 2); /* to the next IE element */ } =20 return ielength; - } =20 /* */ @@ -1986,7 +1972,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, = u8 *bssid) =20 for (i =3D 0; i < NUM_PMKID_CACHE; i++) if ((p->PMKIDList[i].bUsed) && - (!memcmp(p->PMKIDList[i].Bssid, bssid, ETH_ALEN))) + (!memcmp(p->PMKIDList[i].Bssid, bssid, ETH_ALEN))) return i; return -1; } @@ -2035,7 +2021,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u authmode =3D WLAN_EID_RSN; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - memcpy(out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len= ); + memcpy(out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_l= en); =20 ielength +=3D psecuritypriv->wps_ie_len; } else if ((authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) || (authmode =3D=3D= WLAN_EID_RSN)) { @@ -2130,7 +2116,7 @@ void rtw_joinbss_reset(struct adapter *padapter) u8 threshold; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + 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 */ =20 @@ -2156,11 +2142,11 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 void rtw_ht_use_default_setting(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; - bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; - bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; + bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; + bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; =20 if (pregistrypriv->wifi_spec) phtpriv->bss_coexist =3D 1; @@ -2214,7 +2200,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8= *out_ie, uint *pout_len) =20 if (padapter->mlmepriv.qospriv.qos_option =3D=3D 0) { out_len =3D *pout_len; - rtw_set_ie(out_ie+out_len, WLAN_EID_VENDOR_SPECIFIC, + rtw_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC, _WMM_IE_Length_, WMM_IE, pout_len); =20 padapter->mlmepriv.qospriv.qos_option =3D 1; @@ -2232,7 +2218,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; =20 phtpriv->ht_option =3D false; @@ -2259,7 +2245,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ } else { p =3D rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); if (p && (ielen =3D=3D sizeof(struct ieee80211_ht_addt_info))) { - struct HT_info_element *pht_info =3D (struct HT_info_element *)(p+2); + struct HT_info_element *pht_info =3D (struct HT_info_element *)(p + 2); =20 if (pht_info->infos[0] & BIT(2)) { switch (pht_info->infos[0] & 0x3) { @@ -2327,14 +2313,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); =20 - ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor&0x03); + ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor & 0x03); =20 if (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_) - ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2= )); + ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 = << 2)); else - ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00); + ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00); =20 - rtw_set_ie(out_ie+out_len, WLAN_EID_HT_CAPABILITY, + rtw_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY, sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len= ); =20 phtpriv->ht_option =3D true; @@ -2343,12 +2329,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ p =3D rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); if (p && (ielen =3D=3D sizeof(struct ieee80211_ht_addt_info))) { out_len =3D *pout_len; - rtw_set_ie(out_ie+out_len, WLAN_EID_HT_OPERATION, ielen, p+2, pout_len); + rtw_set_ie(out_ie + out_len, WLAN_EID_HT_OPERATION, ielen, p + 2, pout_= len); } } =20 return phtpriv->ht_option; - } =20 /* the function is > passive_level (in critical_section) */ @@ -2379,12 +2364,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8= *pie, uint ie_len, u8 channe 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); + pht_capie =3D (struct ieee80211_ht_cap *)(p + 2); max_ampdu_sz =3D (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_= FACTOR); - max_ampdu_sz =3D 1 << (max_ampdu_sz+3); /* max_ampdu_sz (kbytes); */ + max_ampdu_sz =3D 1 << (max_ampdu_sz + 3); /* max_ampdu_sz (kbytes); */ =20 phtpriv->rx_ampdu_maxlen =3D max_ampdu_sz; - } =20 len =3D 0; @@ -2473,21 +2457,20 @@ void rtw_issue_addbareq_cmd(struct adapter *padapte= r, struct xmit_frame *pxmitfr phtpriv =3D &psta->htpriv; =20 if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued =3D (phtpriv->agg_enable_bitmap>>priority)&0x1; - issued |=3D (phtpriv->candidate_tid_bitmap>>priority)&0x1; + issued =3D (phtpriv->agg_enable_bitmap >> priority) & 0x1; + issued |=3D (phtpriv->candidate_tid_bitmap >> priority) & 0x1; =20 if (issued =3D=3D 0) { psta->htpriv.candidate_tid_bitmap |=3D BIT((u8)priority); - rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra); + rtw_addbareq_cmd(padapter, (u8)priority, pattrib->ra); } } - } =20 void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *po= ut_len) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; u8 cap_content[8] =3D {0}; =20 if (phtpriv->bss_coexist) @@ -2547,7 +2530,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_MASTER_= 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.45.3 From nobody Sun Feb 8 12:22:41 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 01BD2211A0E for ; Wed, 5 Feb 2025 01:50:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720231; cv=none; b=nSvtvCZ2ZEVKfpy05Q2vi+c4hI5jbSqlrqwAbOLl2F8+7q+IqRUb8hBbviglR3Edcw4KforpKuMJxgU7JZ8EtdoqatV9SI8v2kDqUoFX3mQrHI2WnVtLipBqtq0m/18Z0aR2smIPLiF+uUM9A+5y6RtszMVX+smMN4+EUYKhwZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738720231; c=relaxed/simple; bh=vsfosK4EDGncw/JpLWreyZi0mpIhSDZJ0eulurqB8Js=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nLcszGZGqBmc2Y09kKW65KaD2flKZzCzLTm79YWvgeYOBjoKTkgZPnNfEcdQscDdjCPa9pIgdbAj9o+OA75mdGJmBQGBbeb2BOn3TeeJoDgc2acMwZI78Ojg4ADlZCiiP188bGPK4Gj2SbFxMC/Bin8O/euuE2auZsmjLk5ARjo= 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=ZXc2dwiv; arc=none smtp.client-ip=209.85.216.45 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="ZXc2dwiv" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2f9cd8ecbceso1923630a91.0 for ; Tue, 04 Feb 2025 17:50:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738720229; x=1739325029; 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=hJ08YcfgbUiop8dwOeKgURJ7wcJBnOw/KKn3/YRa9b0=; b=ZXc2dwivkN9wiPhx5SBna2x1eL8stIipAm4kvETDO4QZCM+bb6HLTiqxXO43QJnIfB 8Ydgofjh3y7PZWsyTbE0kkmxsKdBkD+9JWyqUBk8tZzvj4WDL3SUUNLDLi1HuejJGXZY BUrTQs/ADBsj1MYZvWE5xfkmXNhvL5pa4xogURdZEEhYNfQK6TS+jK9fQOPiubfAFw+Y gYuAI0oj5/NoHd91k8qPXm81c89dWXfeOMXApuMdlXn3dZsdYdHHLBpGwoMLbCGYXwXu A5afI3dywFqFTMw43p7O7m42/Qc/KmOlxs8x163ofa55uuR6G/GsNU5TZtTBzA8c8R0B 4/9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738720229; x=1739325029; 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=hJ08YcfgbUiop8dwOeKgURJ7wcJBnOw/KKn3/YRa9b0=; b=u8HhzLG5zunLfcM+Pxh8x8bJFH+X8RVZ6/bY9hGWYK0bn4GvxqM/2mlcOiPekAJoEf Yvm0yjHpLWXykDivRY9EJYV508I9g+MWn7oawiSyH+A9kbL0B3Bt7gJj0VTsmxqb+Hv+ Zr2rZL+7bsvPVXKjTqcK2/zU65o2u9StXwns15Vpk3o6yvAFI8vUC1mvetyQYqCpsVij 2lDAydyP/JXcCvEhemCIinbZcPohKlD4qLfFw69JK4wyfY7SgkLEJnUqS404KHaEkG1g frOp6cX0558KMvUFgcZI5UWLZOMiUMkCrqi/BmioDhFxmNKg590LWVGnA41kssQ99Wb+ wLug== X-Forwarded-Encrypted: i=1; AJvYcCW1w/Rs4p/oNe3XdnXQSCzuDFvMjGbyvNtlzXuRHzaubZj/HSElOKBTz48AXY9y1zj7nlc3f9GHaZr0gWE=@vger.kernel.org X-Gm-Message-State: AOJu0YwzZv4DKVek8ZOAPZtXuow4wLGhqOmsb6ezCT6lBjo0AwybWgSf o50+prF75Uo/YmO7OV4zo+4dKbAwhv/nHWEeV6cs3NyWCtfd7r/P X-Gm-Gg: ASbGncudGhggdIS7RdrR3q19spH0yulWsUDS+WYitCaBuaraKRz5QrLfA5KVVPLdIRA Q26JDJC5Je6cvtR+SLAEqGfDoQz0ltnBbTBRJSYLagA9J2HyE9hhE9SoOEOPrNRBbg4rhM7bD1y PhvNKIDZ5yjQMOfjKPWQENnqt72ALmT091ZS3ILJLyrQgNBxOA6obHjC/hHnhqNfsyw6e53lcEp cZiQoO154maUnOOL8BKn0QA2ZjREjySWkVdqn2p1LeeIY6ITJ2ZxcL48I7WcCovrCdZ63lJnb9M eJKzWAhaCj9RlkknK0JKRzY= X-Google-Smtp-Source: AGHT+IEApOZoxGoFfiDhvmmSwV9n5I2Bw3v+HjLfPGoYIQ9JHhyVVPDO7bDJYvKmPKmMKTla9hFX5A== X-Received: by 2002:a17:90b:1809:b0:2ee:8430:b847 with SMTP id 98e67ed59e1d1-2f9e0753844mr1485997a91.6.1738720229067; Tue, 04 Feb 2025 17:50:29 -0800 (PST) Received: from DESKTOP-GL3U3CJ ([146.70.174.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f9c314b64fsm1302137a91.1.2025.02.04.17.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:50:28 -0800 (PST) From: Ian To To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ian To Subject: [PATCH 4/4] staging: rtl8723bs: fixed comment styling Date: Tue, 4 Feb 2025 17:50:19 -0800 Message-ID: X-Mailer: git-send-email 2.45.3 In-Reply-To: References: 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" Comments were not neat and did not comply with the coding style. Signed-off-by: Ian To --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 71 +++++++++++------------ 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 4d8dc7646867..9bd36440a15b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -185,10 +185,10 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlme= priv, struct wlan_network * } =20 /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing conditio= n... -*/ + * return the wlan_network with the matching addr + * + * Shall be called under atomic context... to avoid possible racing condit= ion... + */ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *= addr) { struct list_head *phead, *plist; @@ -290,10 +290,10 @@ void rtw_free_network_nolock(struct adapter *padapter= , struct wlan_network *pnet } =20 /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing conditio= n... -*/ + * return the wlan_network with the matching addr + * + * Shall be called under atomic context... to avoid possible racing condit= ion... + */ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *a= ddr) { struct wlan_network *pnetwork =3D _rtw_find_network(scanned_queue, addr); @@ -483,11 +483,11 @@ void rtw_update_scanned_network(struct adapter *adapt= er, struct wlan_bssid_ex *t =20 if (!oldest || time_after(oldest->last_scanned, pnetwork->last_scanned)) oldest =3D pnetwork; - } =20 /* If we didn't find a match, then get a new network slot to initialize - * with this beacon's information */ + * with this beacon's information + */ if (!target_find) { if (list_empty & pmlmepriv->free_bss_pool.queue) { /* If there are no more slots, expire the oldest */ @@ -564,11 +564,11 @@ void rtw_add_network(struct adapter *adapter, struct = wlan_bssid_ex *pnetwork) } =20 /* select the desired network based on the capability of the (i)bss. */ -/* check items: (1) security */ -/* (2) network_type */ -/* (3) WMM */ -/* (4) HT */ -/* (5) others */ +/* check items: (1) security */ +/* (2) network_type */ +/* (3) WMM */ +/* (4) HT */ +/* (5) others */ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *p= network); int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *p= network) { @@ -827,8 +827,8 @@ static void find_network(struct adapter *adapter) } =20 /* -*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock -*/ + *rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock + */ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_qu= eue) { struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; @@ -863,8 +863,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, = int lock_scanned_queue) } =20 /* -*rtw_indicate_connect: the caller has to lock pmlmepriv->lock -*/ + *rtw_indicate_connect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -882,8 +882,8 @@ void rtw_indicate_connect(struct adapter *padapter) } =20 /* -*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock -*/ + *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_disconnect(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -1466,9 +1466,9 @@ void rtw_wmm_event_callback(struct adapter *padapter,= u8 *pbuf) } =20 /* -* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss -* @adapter: pointer to struct adapter structure -*/ + * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss + * @adapter: pointer to struct adapter structure + */ void _rtw_join_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D from_timer(adapter, t, @@ -1503,16 +1503,15 @@ void _rtw_join_timeout_handler(struct timer_list *t) =20 /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ rtw_cfg80211_indicate_disconnect(adapter); - } =20 spin_unlock_bh(&pmlmepriv->lock); } =20 /* -* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey -* @adapter: pointer to struct adapter structure -*/ + * rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey + * @adapter: pointer to struct adapter structure + */ void rtw_scan_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D from_timer(adapter, t, @@ -1628,10 +1627,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32= ms) } =20 /* -* Select a new roaming candidate from the original @param candidate and @p= aram competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ + * Select a new roaming candidate from the original @param candidate and @= param competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ static int rtw_check_roaming_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { @@ -1710,10 +1709,10 @@ int rtw_select_roaming_candidate(struct mlme_priv *= mlme) } =20 /* -* Select a new join candidate from the original @param candidate and @para= m competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ + * Select a new join candidate from the original @param candidate and @par= am competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ static int rtw_check_join_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { --=20 2.45.3