From nobody Wed Dec 24 03:33:49 2025 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 0D0A066B32 for ; Mon, 29 Jan 2024 14:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537949; cv=none; b=kcQzCU1Rl55I5BhYC1T8COz9cjH4keOJlcykNc+dYpSMqt5Shuw0xjacbg+pl6Aqndx6Uxgj60TeBspyDRgxFA+ICtNBRz5L2s6OpcGCWQ4UD/u1FBtZiWcG67yTSPpjfmlRI4igtyFZI7J/bqWHe7eHSmofneAr65FrjpMRxMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537949; c=relaxed/simple; bh=AmgX4dnIIJccXjS/P1Fa4Yt9LuV8HcB1AwdQ1cxH5cY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LEzodOoNjUT94bCWpe9mGlXeQ7ZHU4IHDTyBqF/dLdEEvxyyMVYBZdWrE7jnNtSnT9iZLOsPpvRr+3veFOop4BN1uQKwsx0TGh1Eth5vo0JHdiQVSLELp7dqHG3n0dWGGTaZo9p7Msp2RRAyNRWWayvcEC8Qzrvt3FyxQ7Z6F+4= 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=AeA+t8OC; arc=none smtp.client-ip=209.85.221.50 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="AeA+t8OC" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-339289fead2so2335431f8f.3 for ; Mon, 29 Jan 2024 06:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706537946; x=1707142746; 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=2WZVZh+TcA52yG10ogW2Ket+Nh8qPqugIsfHxx9AocE=; b=AeA+t8OCagM7KbI7kzQ+28teScVFrk+nvj/hpDCnIekYY8l2OuttFqZHKNcEJDFabJ vZW9Bbc4btANNOKXQWSffMouX2ygSPxP4OzOO6ooeCYEN9nQAgS+9KM5GpOyccW2UAp1 sF7P3AZCxAN7zhWXCd4Yg0U/mBj6K2w6h60caOHcl+94PdlbPJuI3IOtyr+EYCSd9LYt 049x3fQzj1kVUYB1KsHgslKGfxj6UUIptdwUMFfW7tzqtBzeHu9DwFknuZZcXBr9RfGP U5pJ6G4eWcz8azeo6BYAKDsk+U+uGv2o2sHXRm2D/36o5bYE7vBipLlCpBQ9IA6JzeQF xRLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706537946; x=1707142746; 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=2WZVZh+TcA52yG10ogW2Ket+Nh8qPqugIsfHxx9AocE=; b=qVt8FhbjpvaZhdInEqDSqZsV0UOdfCkALuoAmjp5wlwm+/C9e4D7395n396d12eZmn Hs/AnAYZ2/HVcUZHN9wurKvfQa8fWDug6J1gWpK4lZZBr653eeEIwZCi+NQvht4UV1hf OxuuXUL7ksj4Nhk0Xxj8532bHKnIvlpFReKXtNwizlXEKJ8GeiZrSoa4l4mCjjsBLBZY Ezy+ZEcFqXJshki4TPpW6xygDFy+peZz/CPXxgsrZ3bPa7Tb4bYLdAh0kf8kyXyCeIE7 BlV7kRbWhNOXGYwQImA7ZsMF08tdiFlhmUvn+wpOntmjlqrc68fljpzpoXenxtyNgwIc cFnQ== X-Gm-Message-State: AOJu0YxcXJyxT4ovsFMhRf11ZlrLTNF1huvW8p9TUFUtojwCat+Oi0y0 zOnPiDUyHTf5iQu1oMI3Kf2V+vF0lne/2lKnJzIYybeo7CpvqVGS X-Google-Smtp-Source: AGHT+IGGSunYjC5DCO7P/65m0wPIlDiZUpBKsSOdSPvhn+m+mbRuNRO/sDbpbI3gCSFdhLd0Y2wCNw== X-Received: by 2002:a5d:6da2:0:b0:33a:eca6:b2b5 with SMTP id u2-20020a5d6da2000000b0033aeca6b2b5mr3494482wrs.36.1706537946077; Mon, 29 Jan 2024 06:19:06 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCW5v43gZr13Z1BIwOHTF0NcR9TzueltCHzUtZYG6tBovnmAhQ0duIsp26IEquV9gDmo1tIobBQAW+DmPKJ5imSTmoJ9JYZik5UsAF1VPbBU1dXZCRLaLRglo9gG/FmeImz/VM2WRP0dhGmNYeXTyh1eukUfsWR2iiDYnJfmf60H/gTBFtai2E+W3wk5wMqszCJ9387Nq4TCNQSS1aY/05FPoK6ovxBq Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id ck11-20020a5d5e8b000000b0033af31c1cfesm1699009wrb.29.2024.01.29.06.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:19:05 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Mon, 29 Jan 2024 16:19:03 +0200 To: Greg Kroah-Hartman , Hans de Goede , Ruan Jinjie , Yang Yingliang Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Meir Elisha Subject: [PATCH 1/4] Staging: rtl8723bs: Remove unnecessary braces Date: Mon, 29 Jan 2024 16:18:53 +0200 Message-Id: <20240129141856.416532-2-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129141856.416532-1-meir6264@Gmail.com> References: <20240129141856.416532-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" braces {} are not necessary for single statement blocks Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index b221913733fb..5568215b35bd 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1548,9 +1548,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) int do_join_r; =20 do_join_r =3D rtw_do_join(adapter); - if (do_join_r !=3D _SUCCESS) { + if (do_join_r !=3D _SUCCESS) continue; - } + break; } else { rtw_indicate_disconnect(adapter); @@ -2432,9 +2432,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe return; =20 /* maybe needs check if ap supports rx ampdu. */ - if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable =3D=3D 1) { + if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable =3D=3D 1) phtpriv->ampdu_enable =3D true; - } =20 /* check Max Rx A-MPDU Size */ len =3D 0; --=20 2.34.1 From nobody Wed Dec 24 03:33:49 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 1C4EE67721 for ; Mon, 29 Jan 2024 14:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537952; cv=none; b=DoamyFyprUL5/yrm5xscakWeoV9szm46D6ROyjiHKEqWkv74ghGSBi02Ivz80M3LGqkghkYUuY7ggGh3Mje/Oc0Sux8aeb7ezYQFAkUMjKb5Q5M83My4w485jZMb20I8kwncigxaZWailQpWszXlZBVgBNuczlU84JjjIwBGGbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537952; c=relaxed/simple; bh=XCbPnyAJzGYAzDsFRUzS6cYS5hGjC7javOHTswAiMZM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dMFk4XrnPnV+EPR/0Hl17l95N3CwKWpUsj0ZE9T6402YPSdSb7HLFCIgQBniPBVbOr6R5XPdfY/+++FmmYPM9HTq3JajpQtrYZLJUf0pnXmAhzR85U/Hzn/F35mcbkIpBvWf2g+gajTjrSnQR+ToY5+68wltENzll7yYTR1KsrI= 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=RWidxyXe; arc=none smtp.client-ip=209.85.128.50 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="RWidxyXe" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40ef75adf44so7387475e9.3 for ; Mon, 29 Jan 2024 06:19:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706537949; x=1707142749; 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=Scr7TGftwiIkVPI6gx3gDcxXozHzo+ihW9CsPi6XS+o=; b=RWidxyXeA82zOCx3h6BoQyZ4Wm/z1QdElhy4k2uRTEMzAkVTgTjEH3pH27zJZ43eFY EbsJz5V/5Gdkfk+NUUrtXp4pJjOxt6ln6qjPHlajNiEOeXhlUiiBKoPgUbA8atHjN1j6 e9LFwGgyj521eC4iiSWgcaUxu0iis2RlKfte0Khe2NMYSCESSlhSRia54Yc5qS6vZbrm jBrjZHUL9hX01yiqFHAsyWNuP2/BituyoEe9C08pk6T2GRi7nwPmj6XrSrlGgGs1RIb5 g5Sqr2TmuNpoIG8OEZEIGnqO6mPb+R9WaZFOzTKyL+9Yma8GnvwFCoRXH0+t80pIiP31 f0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706537949; x=1707142749; 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=Scr7TGftwiIkVPI6gx3gDcxXozHzo+ihW9CsPi6XS+o=; b=gZ42a2PNiLAYAtX/ZJ5IXOWkIkfvKoyHQr4p8+pf7wDIE6zBS6jXrqOnKFBb8zSw6c pzQBC+AHb2WJxsG+97VbK0m6NVs86vbst7wG4YxmgCBQVAjbOOFCiiUAMssDpU5FpGzM iOi22wXcEnAVyD5N3n0WrW6IoMbs9SKcpXHUJaINb1G9b70VrqsUeDcg1DyXrUV5vzyL LW2N5EEJvMulFZxk2UnRNO8YBYerxMFVQ6SzzZ+usMFoX8izaPFvAkJQZ0DfHlcnk6AL leeq7520MO1YMqlyT187ZhTf1/P9W4ODSXNvqOZQ7UasJUsEyIoDZOiD3gbBSB0prOvK w3sg== X-Gm-Message-State: AOJu0YwDZetZp0f/SiP8MAcd7fRwLRpOpvWXwkLDrvj/mpscgAKr/d9T u+bZQWsQbwNqd68nvEfepc3GYKkHClmFROZRe5G/KoE9RY9/MtC4 X-Google-Smtp-Source: AGHT+IHM6lhjJCJ/Q74tXbDJ3B3OD0B1U1r8TRriXvRS0BhrR7YUAO9iH3u/zevBqLuoqmUe8jo1fw== X-Received: by 2002:a05:600c:a39c:b0:40e:fb76:533f with SMTP id hn28-20020a05600ca39c00b0040efb76533fmr884356wmb.24.1706537949240; Mon, 29 Jan 2024 06:19:09 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVijBtCHHYgzJJt/lbklHEU1wSKwsG1f/+GzK0ooGp5pldsh/GuWoTWXv/3kGzEnZJgb8rjyXr/Kh/9gPAAuI6/MeGnGqCDDNUP1YMQW/jDltjPMJP88zxq/PRKFBbK/NUMU0Z6f4B00IGRES00lV0PXXjNmp+5tJZYb75JAYsGPXNYa+5i8i6Ys8r59cMVVfffqigXKszm8mLzs55v5uoYiLDzu/sW Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id f7-20020a05600c4e8700b0040e4914f28dsm14173109wmq.18.2024.01.29.06.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:19:08 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Mon, 29 Jan 2024 16:19:06 +0200 To: Greg Kroah-Hartman , Hans de Goede , Ruan Jinjie , Yang Yingliang Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Meir Elisha Subject: [PATCH 2/4] Staging: rtl8723bs: Remove extra spaces Date: Mon, 29 Jan 2024 16:18:54 +0200 Message-Id: <20240129141856.416532-3-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129141856.416532-1-meir6264@Gmail.com> References: <20240129141856.416532-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix checkpatch warning: please, no space before tabs Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 48 +++++++++++------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 5568215b35bd..a7c4350e0783 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -169,7 +169,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor { unsigned int delta_time; u32 lifetime =3D SCANQUEUE_LIFETIME; -/* _irqL irqL; */ +/* _irqL irqL; */ struct __queue *free_queue =3D &(pmlmepriv->free_bss_pool); =20 if (!pnetwork) @@ -389,7 +389,7 @@ int is_same_network(struct wlan_bssid_ex *src, struct w= lan_bssid_ex *dst, u8 fea d_cap =3D le16_to_cpu(tmpd); =20 return (src->ssid.ssid_length =3D=3D dst->ssid.ssid_length) && - /* (src->configuration.ds_config =3D=3D dst->configuration.ds_config) &= & */ + /* (src->configuration.ds_config =3D=3D dst->configuration.ds_config) &&= */ ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) && ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) && ((s_cap & WLAN_CAPABILITY_IBSS) =3D=3D @@ -628,10 +628,10 @@ 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 */ +/* (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) { @@ -1054,9 +1054,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); } =20 - /* Commented by Albert 2012/07/21 */ - /* When doing the WPS, the wps_ie_len won't equal to 0 */ - /* And the Wi-Fi driver shouldn't allow the data packet to be transmitt= ed. */ + /* Commented by Albert 2012/07/21 */ + /* When doing the WPS, the wps_ie_len won't equal to 0 */ + /* And the Wi-Fi driver shouldn't allow the data packet to be transmitte= d. */ if (padapter->securitypriv.wps_ie_len !=3D 0) { psta->ieee8021x_blocked =3D true; padapter->securitypriv.wps_ie_len =3D 0; @@ -1916,10 +1916,10 @@ signed int rtw_set_auth(struct adapter *adapter, st= ruct security_priv *psecurity 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); - signed int res =3D _SUCCESS; + struct cmd_obj *pcmd; + struct setkey_parm *psetkeyparm; + struct cmd_priv *pcmdpriv =3D &(adapter->cmdpriv); + signed int res =3D _SUCCESS; =20 psetkeyparm =3D rtw_zmalloc(sizeof(struct setkey_parm)); if (!psetkeyparm) { @@ -2023,9 +2023,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *= in_ie, u8 *out_ie, uint in_ /* */ /* Search by BSSID, */ /* Return Value: */ -/* -1 :if there is no pre-auth key in the table */ -/* >=3D 0 :if there is pre-auth key, and return the entry id */ -/* */ +/* -1 :if there is no pre-auth key in the table */ +/* >=3D 0 :if there is pre-auth key, and return the entry id */ /* */ =20 static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid) @@ -2186,8 +2185,7 @@ void rtw_joinbss_reset(struct adapter *padapter) { u8 threshold; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - - 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 @@ -2213,11 +2211,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; @@ -2288,7 +2286,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; @@ -2417,7 +2415,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe struct ieee80211_ht_cap *pht_capie; /* struct recv_reorder_ctrl *preorder_ctrl; */ struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; /* struct recv_priv *precvpriv =3D &padapter->recvpriv; */ struct registry_priv *pregistrypriv =3D &padapter->registrypriv; /* struct wlan_network *pcur_network =3D &(pmlmepriv->cur_network);; */ @@ -2546,7 +2544,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter,= struct xmit_frame *pxmitfr 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) --=20 2.34.1 From nobody Wed Dec 24 03:33:49 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 62AAD67743 for ; Mon, 29 Jan 2024 14:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537956; cv=none; b=D4acBkOdFuV4nRG/d1rnTDn3btcl8VnNMR3TJwTGVBXYQRhgX6fCuwvj+KBjiBc0ERld8aWu7cb347WJEf9KiCP/pHQU2gn901VEwKaqHCAsmKrnDqL7srUgjmkcLI4ePfbVw2EfSj7u9Qrx1nEMnchq1PgmPmvZu/NuJj06FAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537956; c=relaxed/simple; bh=szqmi1SLSsMcvFAo1ufwEQ9NdM0JkL1850Ai9HDsJbM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nlge7wINzgEZ1LvcbMDJqEgQrBKc27iPdo/Vl6WRBPc9d/UYv+LN/9K29dBxDna75BoFr/6Zfqy8qZFpg5qf3eCV2Lo8Vx0v4/zTEJkr5034b0RuliNiqnfvtJwapbnY33j6eL85V2UKam6zwoa+ygYmCfR1PYK6VGiTjLNJvK4= 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=HCxmjk03; arc=none smtp.client-ip=209.85.128.51 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="HCxmjk03" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40e80046264so39487505e9.0 for ; Mon, 29 Jan 2024 06:19:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706537952; x=1707142752; 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=x6x2tCWN+qHp2Vb9DmN70O7+q+20TXewO8c18yAWv8w=; b=HCxmjk03vgH9Vb7fF2EQ3Rl0Mm9rId2IrFqKgqy53o//u1mFJv/EhgESG7jJX84Ea0 aOl2kTAyzyvO8Vm9iLBuZF4AFh7L4PhzJAE+SljC+BYJwo2qRFPLSDFducQNjoPYLWxi UMUGUD2YZUVLwJtCq+VdM4WXgiMMxQOM2FzN1bONGPQ1Y203Xf07z+T8c8Ry+N4Tgue4 /Ese760M/ETrz9RlTkGyD+P6i9T7yCOVUtRwtJ33z4qPkUjjmBtiuaA/jvz7CY7TPfjm tHmqDFWb/s+q4VgIfLOTSRBnNp+s7JP5Ax/Fq+/C1xi2jMobBc4olQP5tt7pWvmKYSS8 MNyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706537952; x=1707142752; 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=x6x2tCWN+qHp2Vb9DmN70O7+q+20TXewO8c18yAWv8w=; b=vJn2UXqz7SigBy4D0bbAeRlAcounG2GcOlo2jhcLCGQ+AbF50kvNatqXWUTleQj0VY F68OWwONc280wAJPlTqHSa6BG7I7aI78tmO/QDlWWgp+qPG+zHxu3yN+DOCclWMVR69R WCvKkDLmpphwxTKRm2FjcHL+69PN4c9cxvj0P6oC1B/E+Y36kqracRnVxy/cQVnZRwL7 rHCp66og4trUKgeA6GkX2GmLsp9qAwjmZszykW+J79Am7feAqxuFqWWHFYfcYhun8y1s 8zrOT4/ztTW5A6kzmpK1t3PBVwyFWyWwChhbKdQ8lKbeW8Ff5zlmtY47QJPW+zq2d642 qVYA== X-Gm-Message-State: AOJu0YwsXhlTrTZ37Q4Lg3FdCEk8NFD2a4/szykIiVY3aWQBGCx15j6n RVUNcJCGT4fxqte16D0BN6HN7SDBuD6e2Qug49Mn8Q0LCQOW4uU042Niwrl6GmKTjw== X-Google-Smtp-Source: AGHT+IFTNqtdT7jHUmUVX5AbVUyQ9XzW24nUoOUk/M56gFF8kajDybOcEmyJUz3eOeedQ6VbrrMZ+g== X-Received: by 2002:adf:ff86:0:b0:337:c260:9e6e with SMTP id j6-20020adfff86000000b00337c2609e6emr4175771wrr.16.1706537952558; Mon, 29 Jan 2024 06:19:12 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCU2cwiWBfHN4QUECjEE3UlgRKgpPrcnmIbtxgNeIEm258c6qRQWi4VJhDJmBfHGyRDPkrR5i6b9oWL7Kzz7vPisjELtIfXMBsVxH/YbtnJ5BU0hZxdHa1Z/LWNj1h3Tyh9zDdyXSHtEKItvrF3zKzsYFoeXMC/9G1YLFOSEomWgdlbFJvmadlOCTVvjLoFMthsm+nkHcL4wZWcRnanzczL5G3puLgLp Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id o1-20020adfe801000000b0033725783839sm8194802wrm.110.2024.01.29.06.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:19:12 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Mon, 29 Jan 2024 16:19:09 +0200 To: Greg Kroah-Hartman , Hans de Goede , Ruan Jinjie , Yang Yingliang Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Meir Elisha Subject: [PATCH 3/4] Staging: rtl8723bs: Fix block comments warning Date: Mon, 29 Jan 2024 16:18:55 +0200 Message-Id: <20240129141856.416532-4-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129141856.416532-1-meir6264@Gmail.com> References: <20240129141856.416532-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix checkpatch warning: Block comments use * on subsequent lines Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 152 +++++++++++----------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index a7c4350e0783..044483f3d678 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -110,30 +110,30 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) } =20 /* -struct wlan_network *_rtw_dequeue_network(struct __queue *queue) -{ - _irqL irqL; - - struct wlan_network *pnetwork; - - spin_lock_bh(&queue->lock); - - if (list_empty(&queue->queue)) - - pnetwork =3D NULL; - - else - { - pnetwork =3D container_of(get_next(&queue->queue), struct wlan_network, = list); - - list_del_init(&(pnetwork->list)); - } - - spin_unlock_bh(&queue->lock); - - return pnetwork; -} -*/ + *struct wlan_network *_rtw_dequeue_network(struct __queue *queue) + *{ + * _irqL irqL; + * + * struct wlan_network *pnetwork; + * + * spin_lock_bh(&queue->lock); + * + * if (list_empty(&queue->queue)) + * + * pnetwork =3D NULL; + * + * else + * { + * pnetwork =3D container_of(get_next(&queue->queue), struct wlan_network= , list); + * + * list_del_init(&(pnetwork->list)); + * } + * + * spin_unlock_bh(&queue->lock); + * + * return pnetwork; + *} + */ =20 struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { @@ -218,10 +218,9 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmep= riv, 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; @@ -322,14 +321,14 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) } =20 /* -static struct wlan_network *rtw_dequeue_network(struct __queue *queue) -{ - struct wlan_network *pnetwork; - - pnetwork =3D _rtw_dequeue_network(queue); - return pnetwork; -} -*/ + *static struct wlan_network *rtw_dequeue_network(struct __queue *queue) + *{ + * struct wlan_network *pnetwork; + * + * pnetwork =3D _rtw_dequeue_network(queue); + * return pnetwork; + *} + */ =20 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) @@ -339,10 +338,9 @@ 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); @@ -506,8 +504,8 @@ static void update_current_network(struct adapter *adap= ter, struct wlan_bssid_ex } =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; @@ -541,7 +539,8 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t } =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 (phead =3D=3D plist) { */ if (!target_find) { if (list_empty(&pmlmepriv->free_bss_pool.queue)) { @@ -751,7 +750,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_set_signal_stat_timer(&adapter->recvpriv); =20 if (pmlmepriv->to_join) { - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) { if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D false) { set_fwstate(pmlmepriv, _FW_UNDER_LINKING); =20 @@ -885,8 +884,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; @@ -921,8 +920,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; @@ -942,8 +941,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; @@ -1527,9 +1526,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, @@ -1571,9 +1570,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) } =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, @@ -1691,10 +1690,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) { @@ -1774,10 +1773,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) { @@ -1818,11 +1817,11 @@ 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) { @@ -2090,13 +2089,14 @@ signed int rtw_restruct_sec_ie(struct adapter *adap= ter, u8 *in_ie, u8 *out_ie, u /* copy RSN or SSN */ memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypri= v->supplicant_ie[1]+2); /* debug for CONFIG_IEEE80211W - { - int jj; - printk("supplicant_ie_length =3D%d &&&&&&&&&&&&&&&&&&&\n", psecuritypri= v->supplicant_ie[1]+2); - for (jj =3D 0; jj < psecuritypriv->supplicant_ie[1]+2; jj++) - printk(" %02x ", psecuritypriv->supplicant_ie[jj]); - printk("\n"); - }*/ + *{ + * int jj; + * printk("supplicant_ie_length =3D%d &&&&&&&&&&&&&&&&&&&\n", psecurityp= riv->supplicant_ie[1]+2); + * for (jj =3D 0; jj < psecuritypriv->supplicant_ie[1]+2; jj++) + * printk(" %02x ", psecuritypriv->supplicant_ie[jj]); + * printk("\n"); + *} + */ ielength +=3D psecuritypriv->supplicant_ie[1]+2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } --=20 2.34.1 From nobody Wed Dec 24 03:33:49 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 816ED67757 for ; Mon, 29 Jan 2024 14:19:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537959; cv=none; b=IWXlNE7YvRmCbHBnLxrnf1IMbNk+m+c+EM9MoEu03YUCtd/wHgwIDP7ErRdVvDCRTMbTtXk1fj3xCDSHWa1s0ASpdIXr4QvqCtDUzV7lKrlNPrS0yn0GO9KnVjQYzflSELRCqgchW6l16DHpX7Esjh9KQX0ScJbssPvkzlTficw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537959; c=relaxed/simple; bh=7O6rXoPUceZ5vSfUZs1f50iG4DBaw4PqXEIh8pA+98A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UK3CimCyPSKnqlQjAnBQstP2lbLdZAVowEnlbaAb5LYwpuV+oDo+OBk0TMEjfHsa2W7/WJDXkqJ07oDx54G1TfkZQlLXnvZNU7m8qGQDKZ5Fy+7LVgFKptNo/7ziBvSK5pCd9NSpJI2Gmpp7c1rm3xef+jF5380huPLkm63dVhI= 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=HhCTEMQZ; arc=none smtp.client-ip=209.85.128.52 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="HhCTEMQZ" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40e80046246so15095595e9.1 for ; Mon, 29 Jan 2024 06:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706537956; x=1707142756; 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=y9moHDVvU6z3kwiFZUQJD1fH1NG2dZetKlW8LuOaa3I=; b=HhCTEMQZudA/fsp2SxlAFu6ZyNf5oLuM5KVJrNvggTP1Q+5rasL2sMQyQ7Zg0diYIN xqwXPelp/+Ijj//sP9B1tbMrK4aYRqt8SaDVmxPDyIaoApbMmsP7XgsKlUo8zTxGyKXA Rh1JUyCr8H9zPbBP/fwQ/EpigC3X+jG2dbPAqIDHLYRT81+q15kbMR3xv1x2zeNAzwYk P8rmKqgGiZXixnkqqdOay2tSSRyEX9ZsjgFRjTpEVk3D0Xbr86aw2VRO+MIyJddGN83O QtLOQJLYqThL5IrqIbEK4Urj/Fq+2X6LcomZkWz1JyW/omaYbuxu/juEKzSWcGk9IRIf Ufig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706537956; x=1707142756; 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=y9moHDVvU6z3kwiFZUQJD1fH1NG2dZetKlW8LuOaa3I=; b=VjLJIRaULEHQyfAoEMXA+DklSGRH39gz+mM/rcXPTjCNvpBsH0CFdNC2acrTAcB+9+ vP8xnPGRCaU3BbU5fLy1zY2ZKPxLuRI+XAX829PlIP6aXD1DYjMStAE46Y2V+FFbualr 8Qp5S7eE7akMnwHqBtZCMbXsqIBNVuoDLrE7iAL/ffvYMpUjL73rpBxhIPhe1PkCRYxd pXjsAu0kohJWsAbND5KpBexNv4FdHHUuODCI4FZz7/meu9By/pMIX+FY6w5RuQYGT6W/ eDgMwq2Rzp2aTg4PNnxQEs8+nVnsT+PQ7G0RS5lcIu/vRA3EvpSrLzK71ijeFMsAx2Ke jpfQ== X-Gm-Message-State: AOJu0YyYbsPe0rvFar1NAEfeg3wdfTzrtwUjirmLZN1+V/1sIWj2Iz9f 4lmk6IHa9hv693RbU5w70cCK9sk3H+AS01KQ7Anifb1SHWJsYs/Z X-Google-Smtp-Source: AGHT+IHm6388xm/QTCaGEDK1ImPfBbY9GsIXBQvs2+ki3e6r2DjTGCcPGaDAPpKFu3QXHl8Kc/TsKg== X-Received: by 2002:a05:600c:3b9d:b0:40d:858c:53f6 with SMTP id n29-20020a05600c3b9d00b0040d858c53f6mr5412782wms.2.1706537955755; Mon, 29 Jan 2024 06:19:15 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXdm4wUtSp6rYEMPJ0lKaNsh61o/2lREf5Zq7rC+VWl+F4650XLgIVf07vKJ21/vvbM1453su4X/Q0Qqu3K9HBqHvEh+9g7fXt9yMQHTJFuy9I94ig3FgC47isLk+sRLWAmgRD0i7Yyg+sMzWvtuG1W0v5IbcvaIEnlNz+wqes2FLaQrF+qYdJ1i3SKq5GLjwSMsOE2VcS9PzR4yTGFhJhpv/rH7IkD Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id e21-20020a05600c4e5500b0040efb8118e9sm1200186wmq.38.2024.01.29.06.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:19:15 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Mon, 29 Jan 2024 16:19:12 +0200 To: Greg Kroah-Hartman , Hans de Goede , Ruan Jinjie , Yang Yingliang Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Meir Elisha Subject: [PATCH 4/4] Staging: rtl8723bs: fix else after break warning Date: Mon, 29 Jan 2024 16:18:56 +0200 Message-Id: <20240129141856.416532-5-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129141856.416532-1-meir6264@Gmail.com> References: <20240129141856.416532-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix checkpatch warning: else is not generally useful after a break or return Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 38 +++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 044483f3d678..efaac84f22b4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1540,30 +1540,23 @@ void _rtw_join_timeout_handler(struct timer_list *t) =20 spin_lock_bh(&pmlmepriv->lock); =20 - if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */ + if (rtw_to_roam(adapter) =3D=3D 0) { /* join timeout caused by roaming */ + rtw_indicate_disconnect(adapter); + free_scanqueue(pmlmepriv); + /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ + rtw_cfg80211_indicate_disconnect(adapter); + } else { while (1) { rtw_dec_to_roam(adapter); - if (rtw_to_roam(adapter) !=3D 0) { /* try another */ - int do_join_r; - - do_join_r =3D rtw_do_join(adapter); - if (do_join_r !=3D _SUCCESS) - continue; - - break; - } else { + if (rtw_to_roam(adapter) =3D=3D 0) { rtw_indicate_disconnect(adapter); break; + } else if (rtw_do_join(adapter) !=3D _SUCCESS) { /* try another */ + continue; } - } - - } else { - rtw_indicate_disconnect(adapter); - free_scanqueue(pmlmepriv);/* */ - - /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ - rtw_cfg80211_indicate_disconnect(adapter); =20 + break; + } } =20 spin_unlock_bh(&pmlmepriv->lock); @@ -2102,12 +2095,9 @@ signed int rtw_restruct_sec_ie(struct adapter *adapt= er, u8 *in_ie, u8 *out_ie, u } =20 iEntry =3D SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid); - if (iEntry < 0) { - return ielength; - } else { - if (authmode =3D=3D WLAN_EID_RSN) - ielength =3D rtw_append_pmkid(adapter, iEntry, out_ie, ielength); - } + if (iEntry > 0 && authmode =3D=3D WLAN_EID_RSN) + ielength =3D rtw_append_pmkid(adapter, iEntry, out_ie, ielength); + return ielength; } =20 --=20 2.34.1