From nobody Fri Dec 19 06:32:42 2025 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