From nobody Sun Feb 8 03:58:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1238CEB64D8 for ; Wed, 21 Jun 2023 18:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230328AbjFUSuR (ORCPT ); Wed, 21 Jun 2023 14:50:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbjFUSuO (ORCPT ); Wed, 21 Jun 2023 14:50:14 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A41489B for ; Wed, 21 Jun 2023 11:50:13 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f9bece8e19so11968825e9.1 for ; Wed, 21 Jun 2023 11:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1687373412; x=1689965412; 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=R3jx2b9Mk6wTwyAJZvyHLpveP2xgctvjKCyGVRIC4vU=; b=Ved+5VTcRIF6F5DTcxJG++sULjUtB19mhxF9Ubo1HTbj3rR1uq1RmeGC5jjv4gKFBn Y4zgCc2hgv7ApEqFEMHpodirSQ1QL7kqDukbnW53opZYBRm7HYt2apoxVOJxo2wyNPrp yXZf+4FjZouvxQ166fOEHpVxxzHJxn83ktqUXjDa0rl/JTBJw6QRsWj/OU2PPwKp5RsN 3CpI655lSn3Gcw4KEUcXOSvupkXwUOcPpbcFmg+gnsCNCPPqyFPNqucN0VPZi1tBu6pz h9u9TvyyIkZ1xW0sfpx5kbBUiGbSR7E9/GldBhDinF2uLDYxqzST+lvsR08z81KhoTNa 7ooQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687373412; x=1689965412; 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=R3jx2b9Mk6wTwyAJZvyHLpveP2xgctvjKCyGVRIC4vU=; b=RqAriOUdp0osAVLllp5pVjk1a0UUtnZZMlZR/dxvqKfUDasWGSh2N9FCyGXLZmGLNg f4EhbxMp8lOErEw5E7rWEieV31poG7mznDXVG6mJu386i1VdBuhX+/LLAz4ulTl4c9Sv 1zTq8dMR/kUVniC5XqEkd4Id8wPhL102SGVdJ61zC+RbFvWnqPLD7Y02y9jmaDCd+JJC 2FGW6oNGFsBeGwxpor87kb1wPGwKYtmgT+ALfNwGQWTuqmkoUg+e0Bb08WhiXszFvx/D hItPwlTkiNsKujwb75s0F1JoovHSUDBrBCA2vU3fRHPkSFaxjpMHIiEjapgsPeN8Te0n SJdQ== X-Gm-Message-State: AC+VfDwvqfnOmmWDlaOpo7WQ9PacaanVEqqHT3NdVkQ06w8gYq17TbrW N42ugBcDqMIGxAVIKRCLzYQ= X-Google-Smtp-Source: ACHHUZ4EqJ1KTzEJeOImHHPsqkN0R3NplriF3y1TlxR3i0exheMHaEulgPU16ef3une+6wGwK27+bQ== X-Received: by 2002:a7b:cbcc:0:b0:3f8:f9df:8da1 with SMTP id n12-20020a7bcbcc000000b003f8f9df8da1mr15148791wmi.32.1687373411993; Wed, 21 Jun 2023 11:50:11 -0700 (PDT) Received: from localhost.localdomain ([2a02:810a:9640:26a8:5d4c:afae:7fa:7038]) by smtp.gmail.com with ESMTPSA id v11-20020a7bcb4b000000b003f8d6647661sm16740107wmj.15.2023.06.21.11.50.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Jun 2023 11:50:11 -0700 (PDT) From: Franziska Naepelt X-Google-Original-From: Franziska Naepelt To: franziska.naepelt@googlemail.com Cc: eperi1024@gmail.com, franziska.naepelt@gmail.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, johannes.berg@intel.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, quic_vjakkam@quicinc.com, tegongkang@gmail.com Subject: [PATCH v2 1/5] staging: rtl8723bs: Fix indentation issues Date: Wed, 21 Jun 2023 20:50:01 +0200 Message-Id: <20230621185001.25144-1-franziska.naepelt@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230621184635.25064-1-franziska.naepelt@gmail.com> References: <20230621184635.25064-1-franziska.naepelt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following checkpatch indentation issues: - WARNING: suspect code indent for conditional statements (32, 48) - WARNING: suspect code indent for conditional statements (24, 24) - ERROR: code indent should use tabs where possible Signed-off-by: Franziska Naepelt --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 84a9f4dd8f95..1afd1a93bcee 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -581,7 +581,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa =20 psecuritypriv->dot118021XGrpPrivacy =3D _WEP40_; if (param->u.crypt.key_len =3D=3D 13) - psecuritypriv->dot118021XGrpPrivacy =3D _WEP104_; + psecuritypriv->dot118021XGrpPrivacy =3D _WEP104_; =20 } else if (strcmp(param->u.crypt.alg, "TKIP") =3D=3D 0) { psecuritypriv->dot118021XGrpPrivacy =3D _TKIP_; @@ -1305,7 +1305,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } else if (request->n_channels <=3D 4) { for (j =3D request->n_channels - 1; j >=3D 0; j--) for (i =3D 0; i < survey_times; i++) - memcpy(&ch[j*survey_times+i], &ch[j], sizeof(struct rtw_ieee80211_chann= el)); + memcpy(&ch[j*survey_times+i], &ch[j], sizeof(struct rtw_ieee80211_chan= nel)); _status =3D rtw_sitesurvey_cmd(padapter, ssid, RTW_SSID_SCAN_AMOUNT, ch,= survey_times * request->n_channels); } else { _status =3D rtw_sitesurvey_cmd(padapter, ssid, RTW_SSID_SCAN_AMOUNT, NUL= L, 0); @@ -2810,7 +2810,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct d= evice *dev) wdev->netdev =3D pnetdev; =20 wdev->iftype =3D NL80211_IFTYPE_STATION; /* will be init in rtw_hal_init= () */ - /* Must sync with _rtw_init_mlme_= priv() */ + /* Must sync with _rtw_init_mlme_priv() */ /* pmlmepriv->fw_state =3D WIFI_STATION_STATE */ padapter->rtw_wdev =3D wdev; pnetdev->ieee80211_ptr =3D wdev; --=20 2.39.2 (Apple Git-143) From nobody Sun Feb 8 03:58:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63174EB64D8 for ; Wed, 21 Jun 2023 18:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230473AbjFUSwo (ORCPT ); Wed, 21 Jun 2023 14:52:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbjFUSwf (ORCPT ); Wed, 21 Jun 2023 14:52:35 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A68510F6 for ; Wed, 21 Jun 2023 11:52:28 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f8f3786f20so73245655e9.2 for ; Wed, 21 Jun 2023 11:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1687373546; x=1689965546; 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=2XxKRhii9jz/SSvnP3Rvp5gqtHBBhqPsoYXbvA85nbE=; b=Z/uOYZ0+9cASIRm8wVzTOGHyi13TTBA6v/wOgeDiRBTEBX7nBfyEZZUBZJuQKQsl6H k6280uj60OXlUd2FjoLZixxB9t94YGz5DtxEtX14io16mjbTxFWPebxdMxBHJuKY/e3o 6MFsurvRpcxVI8XLJijqjdawIdtLJcx/kXu5M4VHsCmf5bMuZLHiVneTaTo8heHtxxCg pmKFgMq0TcMjbbxJntpx197c34mgZMwU5iqwWiCQw2AgydqV5RoWDZeCt7bGdMHL6dhK fVyAHp4ZEpCg6W1OLkZnas4F/5pI0Iw3zepiLt5xQ+j0FHSEkTEw+AheeogfuEmR1k1l wuOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687373546; x=1689965546; 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=2XxKRhii9jz/SSvnP3Rvp5gqtHBBhqPsoYXbvA85nbE=; b=K6NJcZ3Z0cC8AR/eSQi53jSpPYHFHNTujGU9z+va5wqZPBIjhI+sKOiAC0zRGIlxHw di6EcO6UyG0/QbzUm/2U6NG9PcRXkihKHNqzAVTNhrSyo9Ksf/cn/i/SJ+fuzdRuBSQQ YM0QYCtrOimvV5Mi547zix1Kf92hg8ZsJZCMTwiRUtJF8vLY1gzdXgHW12y1kSWrUHRY xulaLvnZtoX9udor4LzCs+I9Y4jNmq5gqgc2xdFAEiUM2A2otGjwurNBlV2Lb6f5ynWT cOppX1RHrdZiYBQDMpPqU47BZDbtEB0iHggTa6BqoykhvL1oJzgprVLELh1gJJkax6NR KEcw== X-Gm-Message-State: AC+VfDygBEAOGpsO89zU4KZ9HJGYRwvG+JPGjKoSg6mnAex67bjTxYsS fawqak1twVkGAarlxnqsMpk= X-Google-Smtp-Source: ACHHUZ5pp77gkfir8AIg/D/+2YLp/SO2okjskiHOqbuj+aqu6SV/kzcjOB3Hp690aWnawGAmHFw+Bw== X-Received: by 2002:adf:cd91:0:b0:312:74a9:825a with SMTP id q17-20020adfcd91000000b0031274a9825amr7727511wrj.62.1687373546236; Wed, 21 Jun 2023 11:52:26 -0700 (PDT) Received: from localhost.localdomain ([2a02:810a:9640:26a8:5d4c:afae:7fa:7038]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f7e4d143cfsm5745734wmi.15.2023.06.21.11.52.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Jun 2023 11:52:25 -0700 (PDT) From: Franziska Naepelt X-Google-Original-From: Franziska Naepelt To: franziska.naepelt@googlemail.com Cc: eperi1024@gmail.com, franziska.naepelt@gmail.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, johannes.berg@intel.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, quic_vjakkam@quicinc.com, tegongkang@gmail.com Subject: [PATCH v2 2/5] staging: rtl8723bs: Fix space issues Date: Wed, 21 Jun 2023 20:52:23 +0200 Message-Id: <20230621185223.25193-1-franziska.naepelt@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230621184635.25064-1-franziska.naepelt@gmail.com> References: <20230621184635.25064-1-franziska.naepelt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following checkpatch space issues: - CHECK: spaces preferred around that '*' (ctx:VxV) - CHECK: spaces preferred around that '+' (ctx:VxV) - CHECK: spaces preferred around that '-' (ctx:VxV) - CHECK: spaces preferred around that '|' (ctx:VxV) - CHECK: No space is necessary after a cast - WARNING: please, no spaces at the start of a line Signed-off-by: Franziska Naepelt --- v2: Remove blank line fix --- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 1afd1a93bcee..ca642eb5d73e 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -95,14 +95,14 @@ static struct ieee80211_channel rtw_2ghz_channels[] =3D= { static void rtw_2g_channels_init(struct ieee80211_channel *channels) { memcpy((void *)channels, (void *)rtw_2ghz_channels, - sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM + sizeof(struct ieee80211_channel) * RTW_2G_CHANNELS_NUM ); } static void rtw_2g_rates_init(struct ieee80211_rate *rates) { memcpy(rates, rtw_g_rates, - sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM + sizeof(struct ieee80211_rate) * RTW_G_RATES_NUM ); } @@ -126,8 +126,8 @@ static struct ieee80211_supported_band *rtw_spt_band_al= loc( if (!spt_band) goto exit; - spt_band->channels =3D (struct ieee80211_channel *)(((u8 *)spt_band)+size= of(struct ieee80211_supported_band)); - spt_band->bitrates =3D (struct ieee80211_rate *)(((u8 *)spt_band->channel= s)+sizeof(struct ieee80211_channel)*n_channels); + spt_band->channels =3D (struct ieee80211_channel *)(((u8 *)spt_band) + si= zeof(struct ieee80211_supported_band)); + spt_band->bitrates =3D (struct ieee80211_rate *)(((u8 *)spt_band->channel= s) + sizeof(struct ieee80211_channel) * n_channels); spt_band->band =3D band; spt_band->n_channels =3D n_channels; spt_band->n_bitrates =3D n_bitrates; @@ -247,10 +247,10 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct a= dapter *padapter, struct wl u32 wpsielen =3D 0; u8 *wpsie =3D NULL; - wpsie =3D rtw_get_wps_ie(pnetwork->network.ies+_FIXED_IE_LENGTH_, pnetwo= rk->network.ie_length-_FIXED_IE_LENGTH_, NULL, &wpsielen); + wpsie =3D rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnet= work->network.ie_length - _FIXED_IE_LENGTH_, NULL, &wpsielen); if (wpsie && wpsielen > 0) - psr =3D rtw_get_wps_attr_content(wpsie, wpsielen, WPS_ATTR_SELECTED_RE= GISTRAR, (u8 *)(&sr), NULL); + psr =3D rtw_get_wps_attr_content(wpsie, wpsielen, WPS_ATTR_SELECTED_REG= ISTRAR, (u8 *)(&sr), NULL); if (sr !=3D 0) { /* it means under processing WPS */ @@ -277,9 +277,9 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl /* We've set wiphy's signal_type as CFG80211_SIGNAL_TYPE_MBM: signal stre= ngth in mBm (100*dBm) */ if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true && is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0))= { - notify_signal =3D 100*translate_percentage_to_dbm(padapter->recvpriv.sig= nal_strength);/* dbm */ + notify_signal =3D 100 * translate_percentage_to_dbm(padapter->recvpriv.s= ignal_strength);/* dbm */ } else { - notify_signal =3D 100*translate_percentage_to_dbm(pnetwork->network.phy_= info.signal_strength);/* dbm */ + notify_signal =3D 100 * translate_percentage_to_dbm(pnetwork->network.ph= y_info.signal_strength);/* dbm */ } buf =3D kzalloc(MAX_BSSINFO_LEN, GFP_ATOMIC); @@ -452,20 +452,20 @@ void rtw_cfg80211_indicate_connect(struct adapter *pa= dapter) roam_info.links[0].channel =3D notify_channel; roam_info.links[0].bssid =3D cur_network->network.mac_address; roam_info.req_ie =3D - pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2; + pmlmepriv->assoc_req + sizeof(struct ieee80211_hdr_3addr) + 2; roam_info.req_ie_len =3D - pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2; + pmlmepriv->assoc_req_len - sizeof(struct ieee80211_hdr_3addr) - 2; roam_info.resp_ie =3D - pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6; + pmlmepriv->assoc_rsp + sizeof(struct ieee80211_hdr_3addr) + 6; roam_info.resp_ie_len =3D - pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6; + pmlmepriv->assoc_rsp_len - sizeof(struct ieee80211_hdr_3addr) - 6; cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC); } else { cfg80211_connect_result(padapter->pnetdev, cur_network->network.mac_addr= ess - , pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2 - , pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2 - , pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6 - , pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6 + , pmlmepriv->assoc_req + sizeof(struct ieee80211_hdr_3addr) + 2 + , pmlmepriv->assoc_req_len - sizeof(struct ieee80211_hdr_3addr) - 2 + , pmlmepriv->assoc_rsp + sizeof(struct ieee80211_hdr_3addr) + 6 + , pmlmepriv->assoc_rsp_len - sizeof(struct ieee80211_hdr_3addr) - 6 , WLAN_STATUS_SUCCESS, GFP_ATOMIC); } } @@ -720,7 +720,7 @@ static int rtw_cfg80211_set_encryption(struct net_devic= e *dev, struct ieee_param param->u.crypt.err =3D 0; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] =3D '\0'; - if (param_len < (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param-= >u.crypt.key_len) { + if (param_len < (u32)((u8 *)param->u.crypt.key - (u8 *)param) + param->u.= crypt.key_len) { ret =3D -EINVAL; goto exit; } @@ -1035,10 +1035,10 @@ static int cfg80211_rtw_get_station(struct wiphy *w= iphy, } /* for Ad-Hoc/AP mode */ - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) - || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) - || check_fwstate(pmlmepriv, WIFI_AP_STATE)) - && check_fwstate(pmlmepriv, _FW_LINKED)) { + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || + check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(pmlmepriv, WIFI_AP_STATE)) && + check_fwstate(pmlmepriv, _FW_LINKED)) { /* TODO: should acquire station info... */ } @@ -1237,7 +1237,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy spin_unlock_bh(&pwdev_priv->scan_req_lock); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) { - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_L= INKING) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS | _FW_UNDER_SURVEY | _FW_UND= ER_LINKING) =3D=3D true) { need_indicate_scan_done =3D true; goto check_need_indicate_scan_done; } @@ -1291,7 +1291,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } /* parsing channels, n_channels */ - memset(ch, 0, sizeof(struct rtw_ieee80211_channel)*RTW_CHANNEL_SCAN_AMOUN= T); + memset(ch, 0, sizeof(struct rtw_ieee80211_channel) * RTW_CHANNEL_SCAN_AMO= UNT); for (i =3D 0; i < request->n_channels && i < RTW_CHANNEL_SCAN_AMOUNT; i++= ) { ch[i].hw_value =3D request->channels[i]->hw_value; ch[i].flags =3D request->channels[i]->flags; @@ -1305,7 +1305,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } else if (request->n_channels <=3D 4) { for (j =3D request->n_channels - 1; j >=3D 0; j--) for (i =3D 0; i < survey_times; i++) - memcpy(&ch[j*survey_times+i], &ch[j], sizeof(struct rtw_ieee80211_chan= nel)); + memcpy(&ch[j * survey_times + i], &ch[j], sizeof(struct rtw_ieee80211_= channel)); _status =3D rtw_sitesurvey_cmd(padapter, ssid, RTW_SSID_SCAN_AMOUNT, ch,= survey_times * request->n_channels); } else { _status =3D rtw_sitesurvey_cmd(padapter, ssid, RTW_SSID_SCAN_AMOUNT, NUL= L, 0); @@ -1461,7 +1461,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *pa= dapter, u8 *pie, size_t iel goto exit; } - if (ielen > MAX_WPA_IE_LEN+MAX_WPS_IE_LEN+MAX_P2P_IE_LEN) { + if (ielen > MAX_WPA_IE_LEN + MAX_WPS_IE_LEN + MAX_P2P_IE_LEN) { ret =3D -EINVAL; goto exit; } @@ -1481,19 +1481,19 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *= padapter, u8 *pie, size_t iel pwpa =3D rtw_get_wpa_ie(buf, &wpa_ielen, ielen); if (pwpa && wpa_ielen > 0) { - if (rtw_parse_wpa_ie(pwpa, wpa_ielen+2, &group_cipher, &pairwise_cipher,= NULL) =3D=3D _SUCCESS) { + if (rtw_parse_wpa_ie(pwpa, wpa_ielen + 2, &group_cipher, &pairwise_ciphe= r, NULL) =3D=3D _SUCCESS) { padapter->securitypriv.dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeWPAPSK; - memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2); + memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen + 2); } } pwpa2 =3D rtw_get_wpa2_ie(buf, &wpa2_ielen, ielen); if (pwpa2 && wpa2_ielen > 0) { - if (rtw_parse_wpa2_ie(pwpa2, wpa2_ielen+2, &group_cipher, &pairwise_ciph= er, NULL) =3D=3D _SUCCESS) { + if (rtw_parse_wpa2_ie(pwpa2, wpa2_ielen + 2, &group_cipher, &pairwise_ci= pher, NULL) =3D=3D _SUCCESS) { padapter->securitypriv.dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeWPA2PSK; - memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2); + memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen + 2); } } @@ -1892,7 +1892,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_= PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed =3D true; - psecuritypriv->PMKIDIndex =3D index+1; + psecuritypriv->PMKIDIndex =3D index + 1; blInserted =3D true; break; } @@ -2094,8 +2094,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry= (struct sk_buff *skb, struc _rtw_xmit_entry(skb, padapter->pnetdev); return NETDEV_TX_OK; - } else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)) = =3D=3D - (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)) { + } else if ((frame_control & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)= ) =3D=3D + (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION)) { /* only for action frames */ struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -2209,7 +2209,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter= *padapter, char *name, str goto out; *ndev =3D pwdev_priv->pmon_ndev =3D mon_ndev; - memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1); + memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ + 1); out: if (ret && mon_wdev) { @@ -2303,14 +2303,14 @@ static int rtw_add_beacon(struct adapter *adapter, = const u8 *head, size_t head_l if (head_len < 24) return -EINVAL; - pbuf =3D rtw_zmalloc(head_len+tail_len); + pbuf =3D rtw_zmalloc(head_len + tail_len); if (!pbuf) return -ENOMEM; - memcpy(pbuf, (void *)head+24, head_len-24);/* 24 =3Dbeacon header len. */ - memcpy(pbuf+head_len-24, (void *)tail, tail_len); + memcpy(pbuf, (void *)head + 24, head_len - 24);/* 24 =3Dbeacon header le= n. */ + memcpy(pbuf + head_len - 24, (void *)tail, tail_len); - len =3D head_len+tail_len-24; + len =3D head_len + tail_len - 24; /* check wps ie if inclued */ rtw_get_wps_ie(pbuf + _FIXED_IE_LENGTH_, len - _FIXED_IE_LENGTH_, NULL, &= wps_ielen); @@ -2600,7 +2600,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, pwdev_priv =3D adapter_wdev_data(padapter); /* cookie generation */ - *cookie =3D (unsigned long) buf; + *cookie =3D (unsigned long)buf; /* indicate ack before issue frame to avoid racing with rsp frame */ rtw_cfg80211_mgmt_tx_status(padapter, *cookie, buf, len, ack, GFP_KERNEL); -- 2.39.2 (Apple Git-143) From nobody Sun Feb 8 03:58:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33C16EB64DC for ; Wed, 21 Jun 2023 18:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231648AbjFUSxP (ORCPT ); Wed, 21 Jun 2023 14:53:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231563AbjFUSxC (ORCPT ); Wed, 21 Jun 2023 14:53:02 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CE0E1728 for ; Wed, 21 Jun 2023 11:52:58 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f87592eccfso4805024e87.2 for ; Wed, 21 Jun 2023 11:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1687373576; x=1689965576; 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=2YRiupOCUSfro8Q/9oyxaI+CCWZXMNt299nMeuHo3LM=; b=n7IhLCBWGp9VoSxr8L1eXKpHDWYgIC9mZYIlsTjcyTgfZCJQuEVCgIQ4N5USK6tPdb bsjXTn65pAgaHVjeHX0XxoLd+eVuBX/6AS9QK4HLQ2xON3PPH88oI43eM1K6G8OI/TK/ COyBswnq6BxTKZnYaFG0Gl2NlbRe8giaGVojgtBmjc1yTkQ6VWoUeAijc+4/vB4Z6jGA oWPWE4/ELy47twulDMrW/uwWUdFKibCEKyQ+EBptjuFL4kPKFJLvjKC+dTtxz2oabnvd v8ORvmQQdOtodMR97ZcHs7bbeCx7Hzb2D8iW5I5vREIpOPomvuLoLBlXu9gcMgYfHkzl x5qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687373576; x=1689965576; 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=2YRiupOCUSfro8Q/9oyxaI+CCWZXMNt299nMeuHo3LM=; b=hN2vkRmgLNoEML4IswCa8qglLs8a4qKGgXhcKr2X8No3hQSD7fMnckCuZc2cV8stJC vjDs8uI2iEsNg4MeuTRZCIjhtmNXpTui5M9sbisFqz+RPo5oom70ChLUuEywLVKKISIP IzUM3qw9xKrMLOqZTqy0JQS9hCGXwON4U1qi1eYBsgVGajkehBLCLdoY4mNqQQC9b32g rt0rpUUTErBz2AajkaCDOny6fsVte8NKMT7AgNlTvVu8H3zZ3mLBACL/yjmBq4DzPQYa JBmQ/UBac0z6C0wG3WQtDfs2EWQolLqfVsDUNt//rjEJsaxkqSS3/SUsKmNSWMHbY3gR K3NA== X-Gm-Message-State: AC+VfDw+Gxpa7C+TkMC7Fbfo5Juvn+z/8ksFrPlwz2t0EqNYGIC2I2ml nlVO/8n/MrOtiEHo800kngM= X-Google-Smtp-Source: ACHHUZ6W6LhlchgK22SEtatwlG5kmv0rEU6LJ8Eh91nnTz7/sOqBLxwESdPVVF23VdUkMdlogCyfzQ== X-Received: by 2002:a19:380d:0:b0:4f8:565e:f4ae with SMTP id f13-20020a19380d000000b004f8565ef4aemr9143048lfa.39.1687373576369; Wed, 21 Jun 2023 11:52:56 -0700 (PDT) Received: from localhost.localdomain ([2a02:810a:9640:26a8:5d4c:afae:7fa:7038]) by smtp.gmail.com with ESMTPSA id l20-20020a1ced14000000b003f9b19caabesm5725118wmh.37.2023.06.21.11.52.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Jun 2023 11:52:55 -0700 (PDT) From: Franziska Naepelt X-Google-Original-From: Franziska Naepelt To: franziska.naepelt@googlemail.com Cc: eperi1024@gmail.com, franziska.naepelt@gmail.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, johannes.berg@intel.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, quic_vjakkam@quicinc.com, tegongkang@gmail.com Subject: [PATCH v2 3/5] staging: rtl8723bs: Fix block comment issue Date: Wed, 21 Jun 2023 20:52:53 +0200 Message-Id: <20230621185253.25241-1-franziska.naepelt@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230621184635.25064-1-franziska.naepelt@gmail.com> References: <20230621184635.25064-1-franziska.naepelt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following checkpatch block comment issue: - WARNING: Block comments use * on subsequent lines Signed-off-by: Franziska Naepelt --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index ca642eb5d73e..3b64d0f1b4df 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -329,11 +329,11 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct a= dapter *padapter, struct wl } =20 /* - Check the given bss is valid by kernel API cfg80211_get_bss() - @padapter : the given adapter - - return true if bss is valid, false for not found. -*/ + * Check the given bss is valid by kernel API cfg80211_get_bss() + * @padapter : the given adapter + * + * return true if bss is valid, false for not found. + */ int rtw_cfg80211_check_bss(struct adapter *padapter) { struct wlan_bssid_ex *pnetwork =3D &(padapter->mlmeextpriv.mlmext_info.n= etwork); --=20 2.39.2 (Apple Git-143) From nobody Sun Feb 8 03:58:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B473EB64D7 for ; Wed, 21 Jun 2023 18:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbjFUSxv (ORCPT ); Wed, 21 Jun 2023 14:53:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjFUSxs (ORCPT ); Wed, 21 Jun 2023 14:53:48 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC7681BDA for ; Wed, 21 Jun 2023 11:53:20 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f918922954so39134805e9.2 for ; Wed, 21 Jun 2023 11:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1687373599; x=1689965599; 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=R6tRxvMyM9ZvLueS9fDkGIm5rePBPmA0VT04sZR8ac4=; b=XIL1q396vELEHTSUU8qBtnuRxryn4lrYe3abI1nmaVBhvbshi+/LLCKJXPzQqbJurE yPH/FN8Myb/w4Eb+hO39DjT1rSTolWZyvPsBUqG9v7zofULhAWvUIeNxTguEccDfbMmn KRcgXsWM2LeUCQJ+7dctLaJyVnCTBYRVkbCyXGbSEnaAzbm7BO/WwasvgA0TValI1mvS QrvCvEzXo+fxhn6wLGvS8UWIECsk23iZODF+6/mqU849VkUQk+ElFl+aIpFm/2eF22Ze hOGahHAPHtAbnRWjzsNb5C1ilTd2zbaHFKKi1RwKidHH4nlTGHBURL6GyTfhIw4gNwmZ gXJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687373599; x=1689965599; 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=R6tRxvMyM9ZvLueS9fDkGIm5rePBPmA0VT04sZR8ac4=; b=BUnimu7Psphr4GElTqfuSuyao8PH3suTbT0NepL78FnGjVwRHBEs5FbQIBWoGUY6ZB BZTjEcN2qhrY7iqANqbb149wbH5i1p9oGRSmuxNqPOyMV0NeNTCIa+8h9pgfuuJ5ZD94 3VknVkNdgf+2nEOI2u6JKcZVczJvX5dooZFovtRp660mygjtkSjKgpaCjHQ5fK7UN8JB 1Q3EwwnKDAkGL1afh26FqGEE9Y3rGl1IRnRp31O+3HIhf4kUUnoe2Ww1QLHLIoX4fPgO lKeiBanROscxJaZm+hWE6SiQd+JV1SKDNAw2mRgQPsFoMnhiN4fpNroKOQ4V6P5QTyya ETHA== X-Gm-Message-State: AC+VfDy2jwLUC/vbyQmqxOw00JutDv8o1CDiBprtKFe2Rj5W8akIslWY j02tlyPyg0Tw6jY+xftYjxk= X-Google-Smtp-Source: ACHHUZ47eP2jmACfeOP7zPTJemepKM1upxam1UysMWV+x6sb+XI7Kc6z3bhrMjdKaF1NYbw39BueuQ== X-Received: by 2002:a05:600c:211a:b0:3f6:e59:c04c with SMTP id u26-20020a05600c211a00b003f60e59c04cmr11251779wml.24.1687373598731; Wed, 21 Jun 2023 11:53:18 -0700 (PDT) Received: from localhost.localdomain ([2a02:810a:9640:26a8:5d4c:afae:7fa:7038]) by smtp.gmail.com with ESMTPSA id y7-20020a05600c364700b003f8fbe3bf7asm15062885wmq.32.2023.06.21.11.53.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Jun 2023 11:53:18 -0700 (PDT) From: Franziska Naepelt X-Google-Original-From: Franziska Naepelt To: franziska.naepelt@googlemail.com Cc: eperi1024@gmail.com, franziska.naepelt@gmail.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, johannes.berg@intel.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, quic_vjakkam@quicinc.com, tegongkang@gmail.com Subject: [PATCH v2 4/5] staging: rtl8723bs: Fix blank line issues Date: Wed, 21 Jun 2023 20:53:16 +0200 Message-Id: <20230621185316.25280-1-franziska.naepelt@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230621184635.25064-1-franziska.naepelt@gmail.com> References: <20230621184635.25064-1-franziska.naepelt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following checkpatch blank line issues: - CHECK: Please don't use multiple blank lines - CHECK: Blank lines aren't necessary before a close brace '}' - CHECK: Blank lines aren't necessary after an open brace '{' Signed-off-by: Franziska Naepelt --- v2: Fix additional blank line issue --- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 3b64d0f1b4df..c00a377258d8 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -266,7 +266,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl } /* spin_unlock_bh(&pwdev_priv->scan_req_lock); */ - channel =3D pnetwork->network.configuration.ds_config; freq =3D rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); @@ -305,7 +304,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl memcpy(pwlanhdr->addr2, pnetwork->network.mac_address, ETH_ALEN); memcpy(pwlanhdr->addr3, pnetwork->network.mac_address, ETH_ALEN); - pbuf +=3D sizeof(struct ieee80211_hdr_3addr); len =3D sizeof(struct ieee80211_hdr_3addr); @@ -325,7 +323,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl exit: return bss; - } /* @@ -374,7 +371,6 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter = *padapter) struct wlan_network *scanned =3D pmlmepriv->cur_network_scanned; if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) { - memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex)); rtw_cfg80211_inform_bss(padapter, cur_network); } else { @@ -495,7 +491,6 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *p= adapter) } } - static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct i= eee_param *param, u32 param_len) { int ret =3D 0; @@ -569,7 +564,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa rtw_ap_set_wep_key(padapter, param->u.crypt.key, wep_key_len, wep_key_id= x, 1); goto exit; - } /* group key */ @@ -616,11 +610,9 @@ static int rtw_cfg80211_ap_set_encryption(struct net_d= evice *dev, struct ieee_pa pbcmc_sta->ieee8021x_blocked =3D false; pbcmc_sta->dot118021XPrivacy =3D psecuritypriv->dot118021XGrpPrivacy;/= * rx will use bmc_sta's dot118021XPrivacy */ } - } goto exit; - } if (psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X && psta= ) { /* psk/802_1x */ @@ -643,7 +635,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa psecuritypriv->busetkipkey =3D true; } else if (strcmp(param->u.crypt.alg, "CCMP") =3D=3D 0) { - psta->dot118021XPrivacy =3D _AES_; } else { psta->dot118021XPrivacy =3D _NO_PRIVACY_; @@ -695,17 +686,13 @@ static int rtw_cfg80211_ap_set_encryption(struct net_= device *dev, struct ieee_pa pbcmc_sta->ieee8021x_blocked =3D false; pbcmc_sta->dot118021XPrivacy =3D psecuritypriv->dot118021XGrpPrivacy;= /* rx will use bmc_sta's dot118021XPrivacy */ } - } - } - } exit: return ret; - } static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee= _param *param, u32 param_len) @@ -789,7 +776,6 @@ static int rtw_cfg80211_set_encryption(struct net_devic= e *dev, struct ieee_param if (strcmp(param->u.crypt.alg, "none") !=3D 0) psta->ieee8021x_blocked =3D false; - if ((padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypt= ion2Enabled) || (padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypti= on3Enabled)) { psta->dot118021XPrivacy =3D padapter->securitypriv.dot11PrivacyAlgrth= m; @@ -900,7 +886,6 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, st= ruct net_device *ndev, strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN); - if (!mac_addr || is_broadcast_ether_addr(mac_addr)) param->u.crypt.set_tx =3D 0; /* for wpa/wpa2 group key */ else @@ -932,7 +917,6 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, st= ruct net_device *ndev, kfree(param); return ret; - } static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *nd= ev, @@ -983,7 +967,6 @@ static int cfg80211_rtw_set_default_key(struct wiphy *w= iphy, } return 0; - } static int cfg80211_rtw_get_station(struct wiphy *wiphy, @@ -1168,7 +1151,6 @@ void rtw_cfg80211_surveydone_event_callback(struct ad= apter *padapter) /* ev =3Dtranslate_scan(padapter, a, pnetwork, ev, stop); */ rtw_cfg80211_inform_bss(padapter, pnetwork); } - } spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); @@ -1200,7 +1182,6 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct= adapter *padapter, char *b } return ret; - } static int cfg80211_rtw_scan(struct wiphy *wiphy @@ -1312,7 +1293,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } spin_unlock_bh(&pmlmepriv->lock); - if (_status =3D=3D false) ret =3D -1; @@ -1327,7 +1307,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy exit: return ret; - } static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed) @@ -1342,12 +1321,10 @@ static int rtw_cfg80211_set_wpa_version(struct secu= rity_priv *psecuritypriv, u32 return 0; } - if (wpa_version & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2)) psecuritypriv->ndisauthtype =3D Ndis802_11AuthModeWPAPSK; return 0; - } static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, @@ -1373,7 +1350,6 @@ static int rtw_cfg80211_set_auth_type(struct security= _priv *psecuritypriv, psecuritypriv->ndisencryptstatus =3D Ndis802_11Encryption1Enabled; - break; default: psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; @@ -1381,7 +1357,6 @@ static int rtw_cfg80211_set_auth_type(struct security= _priv *psecuritypriv, } return 0; - } static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u3= 2 cipher, bool ucast) @@ -1391,7 +1366,6 @@ static int rtw_cfg80211_set_cipher(struct security_pr= iv *psecuritypriv, u32 ciph u32 *profile_cipher =3D ucast ? &psecuritypriv->dot11PrivacyAlgrthm : &psecuritypriv->dot118021XGrpPrivacy; - if (!cipher) { *profile_cipher =3D _NO_PRIVACY_; psecuritypriv->ndisencryptstatus =3D ndisencryptstatus; @@ -1603,7 +1577,6 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy= , struct net_device *ndev, } if (params->ssid_len > IW_ESSID_MAX_SIZE) { - ret =3D -E2BIG; goto exit; } @@ -1671,7 +1644,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, padapter->mlmepriv.not_indic_disco =3D true; - if (adapter_wdev_data(padapter)->block =3D=3D true) { ret =3D -EBUSY; goto exit; @@ -1694,7 +1666,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, } if (sme->ssid_len > IW_ESSID_MAX_SIZE) { - ret =3D -E2BIG; goto exit; } @@ -1889,7 +1860,6 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, /* overwrite PMKID */ for (index =3D 0 ; index < NUM_PMKID_CACHE; index++) { if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, E= TH_ALEN)) { - memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_= PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed =3D true; psecuritypriv->PMKIDIndex =3D index + 1; @@ -1899,7 +1869,6 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, } if (!blInserted) { - memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (u8 *)= pmksa->bssid, ETH_ALEN); memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (u8 *)= pmksa->pmkid, WLAN_PMKID_LEN); @@ -2135,11 +2104,9 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entr= y(struct sk_buff *skb, struc pattrib->seqnum =3D pmlmeext->mgnt_seq; pmlmeext->mgnt_seq++; - pattrib->last_txcmdsz =3D pattrib->pktlen; dump_mgntframe(padapter, pmgntframe); - } fail: @@ -2147,11 +2114,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entr= y(struct sk_buff *skb, struc dev_kfree_skb_any(skb); return NETDEV_TX_OK; - } - - static const struct net_device_ops rtw_cfg80211_monitor_if_ops =3D { .ndo_start_xmit =3D rtw_cfg80211_monitor_if_xmit_entry, }; @@ -2324,7 +2288,6 @@ static int rtw_add_beacon(struct adapter *adapter, co= nst u8 *head, size_t head_l else ret =3D -EINVAL; - kfree(pbuf); return ret; @@ -2404,7 +2367,6 @@ static int cfg80211_rtw_del_station(struct wiphy *wip= hy, struct net_device *ndev return -EINVAL; } - spin_lock_bh(&pstapriv->asoc_list_lock); phead =3D &pstapriv->asoc_list; @@ -2423,9 +2385,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wip= hy, struct net_device *ndev break; } - } - } spin_unlock_bh(&pstapriv->asoc_list_lock); @@ -2433,7 +2393,6 @@ static int cfg80211_rtw_del_station(struct wiphy *wip= hy, struct net_device *ndev associated_clients_update(padapter, updated); return ret; - } static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_dev= ice *ndev, @@ -2465,7 +2424,6 @@ static struct sta_info *rtw_sta_info_get_by_idx(const= int idx, struct sta_priv * static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_devic= e *ndev, int idx, u8 *mac, struct station_info *sinfo) { - int ret =3D 0; struct adapter *padapter =3D rtw_netdev_priv(ndev); struct sta_info *psta =3D NULL; @@ -2568,7 +2526,6 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *pada= pter, u8 tx_ch, const u8 *b exit: return ret; - } static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, @@ -2640,7 +2597,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap= , enum nl80211_band band) { - #define MAX_BIT_RATE_40MHZ_MCS15 300 /* Mbps */ #define MAX_BIT_RATE_40MHZ_MCS7 150 /* Mbps */ @@ -2692,12 +2648,10 @@ void rtw_cfg80211_init_wiphy(struct adapter *padapt= er) /* copy mac_addr to wiphy */ memcpy(wiphy->perm_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); - } static void rtw_cfg80211_preinit_wiphy(struct adapter *padapter, struct wi= phy *wiphy) { - wiphy->signal_type =3D CFG80211_SIGNAL_TYPE_MBM; wiphy->max_scan_ssids =3D RTW_SSID_SCAN_AMOUNT; @@ -2844,7 +2798,6 @@ int rtw_wdev_alloc(struct adapter *padapter, struct d= evice *dev) wiphy_free(wiphy); exit: return ret; - } void rtw_wdev_free(struct wireless_dev *wdev) -- 2.39.2 (Apple Git-143) From nobody Sun Feb 8 03:58:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF48AEB64D7 for ; Wed, 21 Jun 2023 18:54:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbjFUSyN (ORCPT ); Wed, 21 Jun 2023 14:54:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbjFUSyK (ORCPT ); Wed, 21 Jun 2023 14:54:10 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C1B51BD0 for ; Wed, 21 Jun 2023 11:53:36 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b474dac685so59793141fa.3 for ; Wed, 21 Jun 2023 11:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1687373609; x=1689965609; 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=k3lPC1NaG28i6896h3scqLwd/Pl9ZFzYUuPdAO/i3WU=; b=XrJaA0H0SRoAFquW7IZSmQp1SusTeKgfmT+8/gUMxlvLm0YfbAFuoIK6KP21aHOjIo dLSSDR1u4XtvDNcn3/HKDtTdxiX+WsYBTvoLtL78PAN/fcqSsMcIv0FbURUin6s79gsN K10YDn/G0RS1sYp8cVbN5V/ygo3tLRvWzLsMNQi7+NIg6hYGX1vCzj76CuEZpSrPyukW iQKZuwrHmZlfcGDDhs/8/4nYa7yoPyVMkdsJQqTUJlQ993EXHHEw4wUjPtQ+Z0js0XWL BjPDu4Txc31U82YC/J2h9DZSLwbRL353JYJQ2Xkc/oKcalSQ+j5KOf/gdl/1XnSsB/0g L7yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687373609; x=1689965609; 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=k3lPC1NaG28i6896h3scqLwd/Pl9ZFzYUuPdAO/i3WU=; b=MrjALxDzSEFiLkBxmL/B+8HaZfgJL3CNRhvJZCYANjm+DxK8/bWHLmYcRVEAqZH1sE v/j0qsly3T3J4uNg/Wip7qVWgnl59h6QIgBSaxWFEwJeDE5S7Z0Txd9Thua6paC49L1b DF/PB3o0Aor0IU0khZ41WDHE47kQcegCnu1XTJuX90un8ixkRvJtvEqSdRJkAkS/M0Fq 6nbF2zjwUU8vZiDxb9/5teDJu4FvDuGhq0a1nJjCPPPKZhJIjLtZi/ZsqBiLN+riU6si v75cQ+CMKOggKNv8McKThA/UCUQhtqd3ZvcMAEfXJ/8EbzBbAb0bq3wfRMtyekalKFyq Fo1Q== X-Gm-Message-State: AC+VfDzgtnvIRgrfMfC5h5h6JffmQQ7ArZj7KYvTuk1EmzDLaFnBHKdE NNZFBkscIkmQty0ZkLOR6R4= X-Google-Smtp-Source: ACHHUZ4FWFIr1sFjj3U9u4EbT+Mqwo5sa/dHS6tIpNztkeRNwHjITvvkGYd0luZqVcpck0VzERcZlA== X-Received: by 2002:a19:7714:0:b0:4f8:5717:f771 with SMTP id s20-20020a197714000000b004f85717f771mr9355802lfc.21.1687373609007; Wed, 21 Jun 2023 11:53:29 -0700 (PDT) Received: from localhost.localdomain ([2a02:810a:9640:26a8:5d4c:afae:7fa:7038]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f7e4d143cfsm5747548wmi.15.2023.06.21.11.53.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Jun 2023 11:53:28 -0700 (PDT) From: Franziska Naepelt X-Google-Original-From: Franziska Naepelt To: franziska.naepelt@googlemail.com Cc: eperi1024@gmail.com, franziska.naepelt@gmail.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, johannes.berg@intel.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, quic_vjakkam@quicinc.com, tegongkang@gmail.com Subject: [PATCH v2 5/5] staging: rtl8723bs: Fix alignment open parenthesis Date: Wed, 21 Jun 2023 20:53:26 +0200 Message-Id: <20230621185326.25316-1-franziska.naepelt@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230621184635.25064-1-franziska.naepelt@gmail.com> References: <20230621184635.25064-1-franziska.naepelt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following checkpatch issues: - CHECK: Alignment should match open parenthesis Signed-off-by: Franziska Naepelt --- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index c00a377258d8..292cba045023 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -95,14 +95,14 @@ static struct ieee80211_channel rtw_2ghz_channels[] =3D= { static void rtw_2g_channels_init(struct ieee80211_channel *channels) { memcpy((void *)channels, (void *)rtw_2ghz_channels, - sizeof(struct ieee80211_channel) * RTW_2G_CHANNELS_NUM + sizeof(struct ieee80211_channel) * RTW_2G_CHANNELS_NUM ); } =20 static void rtw_2g_rates_init(struct ieee80211_rate *rates) { memcpy(rates, rtw_g_rates, - sizeof(struct ieee80211_rate) * RTW_G_RATES_NUM + sizeof(struct ieee80211_rate) * RTW_G_RATES_NUM ); } =20 @@ -275,7 +275,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl =20 /* We've set wiphy's signal_type as CFG80211_SIGNAL_TYPE_MBM: signal stre= ngth in mBm (100*dBm) */ if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true && - is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0))= { + is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, = 0)) { notify_signal =3D 100 * translate_percentage_to_dbm(padapter->recvpriv.s= ignal_strength);/* dbm */ } else { notify_signal =3D 100 * translate_percentage_to_dbm(pnetwork->network.ph= y_info.signal_strength);/* dbm */ @@ -313,7 +313,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct ada= pter *padapter, struct wl *((__le64 *)pbuf) =3D cpu_to_le64(notify_timestamp); =20 bss =3D cfg80211_inform_bss_frame(wiphy, notify_channel, (struct ieee8021= 1_mgmt *)buf, - len, notify_signal, GFP_ATOMIC); + len, notify_signal, GFP_ATOMIC); =20 if (unlikely(!bss)) goto exit; @@ -345,9 +345,9 @@ int rtw_cfg80211_check_bss(struct adapter *padapter) =20 notify_channel =3D ieee80211_get_channel(padapter->rtw_wdev->wiphy, freq); bss =3D cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel, - pnetwork->mac_address, pnetwork->ssid.ssid, - pnetwork->ssid.ssid_length, - IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY); + pnetwork->mac_address, pnetwork->ssid.ssid, + pnetwork->ssid.ssid_length, + IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY); =20 cfg80211_put_bss(padapter->rtw_wdev->wiphy, bss); =20 @@ -486,7 +486,7 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *p= adapter) NULL, 0, true, GFP_ATOMIC); } else { cfg80211_connect_result(padapter->pnetdev, NULL, NULL, 0, NULL, 0, - WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/); + WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/); } } } @@ -777,7 +777,7 @@ static int rtw_cfg80211_set_encryption(struct net_devic= e *dev, struct ieee_param psta->ieee8021x_blocked =3D false; =20 if ((padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypt= ion2Enabled) || - (padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypti= on3Enabled)) { + (padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encryp= tion3Enabled)) { psta->dot118021XPrivacy =3D padapter->securitypriv.dot11PrivacyAlgrth= m; } =20 @@ -826,7 +826,7 @@ static int rtw_cfg80211_set_encryption(struct net_devic= e *dev, struct ieee_param pbcmc_sta->ieee8021x_blocked =3D false; =20 if ((padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypt= ion2Enabled) || - (padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encrypti= on3Enabled)) { + (padapter->securitypriv.ndisencryptstatus =3D=3D Ndis802_11Encryp= tion3Enabled)) { pbcmc_sta->dot118021XPrivacy =3D padapter->securitypriv.dot11PrivacyA= lgrthm; } } @@ -944,9 +944,9 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, st= ruct net_device *ndev, } =20 static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, - struct net_device *ndev, int link_id, u8 key_index - , bool unicast, bool multicast - ) + struct net_device *ndev, int link_id, + u8 key_index, bool unicast, + bool multicast) { struct adapter *padapter =3D rtw_netdev_priv(ndev); struct security_priv *psecuritypriv =3D &padapter->securitypriv; @@ -1121,9 +1121,10 @@ void rtw_cfg80211_unlink_bss(struct adapter *padapte= r, struct wlan_network *pnet struct wlan_bssid_ex *select_network =3D &pnetwork->network; =20 bss =3D cfg80211_get_bss(wiphy, NULL/*notify_channel*/, - select_network->mac_address, select_network->ssid.ssid, - select_network->ssid.ssid_length, IEEE80211_BSS_TYPE_ANY, - IEEE80211_PRIVACY_ANY); + select_network->mac_address, + select_network->ssid.ssid, + select_network->ssid.ssid_length, + IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY); =20 if (bss) { cfg80211_unlink_bss(wiphy, bss); @@ -1328,7 +1329,7 @@ static int rtw_cfg80211_set_wpa_version(struct securi= ty_priv *psecuritypriv, u32 } =20 static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, - enum nl80211_auth_type sme_auth_type) + enum nl80211_auth_type sme_auth_type) { switch (sme_auth_type) { case NL80211_AUTHTYPE_AUTOMATIC: @@ -1633,7 +1634,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiph= y, struct net_device *ndev) } =20 static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *nd= ev, - struct cfg80211_connect_params *sme) + struct cfg80211_connect_params *sme) { int ret =3D 0; enum ndis_802_11_authentication_mode authmode; @@ -1708,7 +1709,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, =20 /* For WEP Shared auth */ if ((psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_Shared || - psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_Auto) && sme-= >key) { + psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_Auto) && sme= ->key) { u32 wep_key_idx, wep_key_len, wep_total_len; struct ndis_802_11_wep *pwep =3D NULL; =20 @@ -1806,15 +1807,14 @@ static int cfg80211_rtw_disconnect(struct wiphy *wi= phy, struct net_device *ndev, } =20 static int cfg80211_rtw_set_txpower(struct wiphy *wiphy, - struct wireless_dev *wdev, - enum nl80211_tx_power_setting type, int mbm) + struct wireless_dev *wdev, + enum nl80211_tx_power_setting type, int mbm) { return 0; } =20 static int cfg80211_rtw_get_txpower(struct wiphy *wiphy, - struct wireless_dev *wdev, - int *dbm) + struct wireless_dev *wdev, int *dbm) { *dbm =3D (12); =20 @@ -2227,7 +2227,7 @@ static struct wireless_dev * } =20 static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy, - struct wireless_dev *wdev + struct wireless_dev *wdev ) { struct net_device *ndev =3D wdev_to_ndev(wdev); @@ -2294,13 +2294,14 @@ static int rtw_add_beacon(struct adapter *adapter, = const u8 *head, size_t head_l } =20 static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *n= dev, - struct cfg80211_ap_settings *settings) + struct cfg80211_ap_settings *settings) { int ret =3D 0; struct adapter *adapter =3D rtw_netdev_priv(ndev); =20 - ret =3D rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.h= ead_len, - settings->beacon.tail, settings->beacon.tail_len); + ret =3D rtw_add_beacon(adapter, settings->beacon.head, + settings->beacon.head_len, settings->beacon.tail, + settings->beacon.tail_len); =20 adapter->mlmeextpriv.mlmext_info.hidden_ssid_mode =3D settings->hidden_ss= id; =20 @@ -2317,8 +2318,9 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy,= struct net_device *ndev, return ret; } =20 -static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_devi= ce *ndev, - struct cfg80211_beacon_data *info) +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, + struct net_device *ndev, + struct cfg80211_beacon_data *info) { struct adapter *adapter =3D rtw_netdev_priv(ndev); =20 @@ -2331,9 +2333,10 @@ static int cfg80211_rtw_stop_ap(struct wiphy *wiphy,= struct net_device *ndev, return 0; } =20 -static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device= *ndev, - const u8 *mac, - struct station_parameters *params) +static int cfg80211_rtw_add_station(struct wiphy *wiphy, + struct net_device *ndev, + const u8 *mac, + struct station_parameters *params) { return 0; } @@ -2395,8 +2398,10 @@ static int cfg80211_rtw_del_station(struct wiphy *wi= phy, struct net_device *ndev return ret; } =20 -static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_dev= ice *ndev, - const u8 *mac, struct station_parameters *params) +static int cfg80211_rtw_change_station(struct wiphy *wiphy, + struct net_device *ndev, + const u8 *mac, + struct station_parameters *params) { return 0; } @@ -2421,8 +2426,10 @@ static struct sta_info *rtw_sta_info_get_by_idx(cons= t int idx, struct sta_priv * return psta; } =20 -static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_devic= e *ndev, - int idx, u8 *mac, struct station_info *sinfo) +static int cfg80211_rtw_dump_station(struct wiphy *wiphy, + struct net_device *ndev, + int idx, u8 *mac, + struct station_info *sinfo) { int ret =3D 0; struct adapter *padapter =3D rtw_netdev_priv(ndev); @@ -2444,8 +2451,9 @@ static int cfg80211_rtw_dump_station(struct wiphy *wi= phy, struct net_device *nde return ret; } =20 -static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device = *ndev, - struct bss_parameters *params) +static int cfg80211_rtw_change_bss(struct wiphy *wiphy, + struct net_device *ndev, + struct bss_parameters *params) { return 0; } @@ -2528,10 +2536,9 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *pad= apter, u8 tx_ch, const u8 *b return ret; } =20 -static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, - struct wireless_dev *wdev, - struct cfg80211_mgmt_tx_params *params, - u64 *cookie) +static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *= wdev, + struct cfg80211_mgmt_tx_params *params, + u64 *cookie) { struct net_device *ndev =3D wdev_to_ndev(wdev); struct ieee80211_channel *chan =3D params->chan; --=20 2.39.2 (Apple Git-143)