From nobody Sat Feb 7 06:13:55 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B00B2D0C84 for ; Sat, 24 Jan 2026 10:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769251930; cv=none; b=oimIWyZN8NQlNCVQd0/IfJN5ikowKSegjtsez5hT0iWOIZkUOW9CcyOftx/l6psPznVsyWJ7497rYYcBQYzo2CXc0QCBLGmuV4SFKyKVtmEGwrvr3HWBrMp4wNFZKP5LWxuh1RgiyuCouGTK0G1GOc6439OX5mPTEYfmZyvr8CI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769251930; c=relaxed/simple; bh=NAhV+EGTrg4zqg2uM5ltnaeo9F7X2r3mhXGdV/D5phw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hdk/2nRtWsDqvUasSowr+1bl0dkZ7i7hmifsulc9e2A2yFWCMdmXJf3pQBTV7nVT5PUJ8wfNHWD57h2NARNaH36Biz4uFO+zmhxv+8I5NgqKfI2SQCj7Z/McbuNlUblbHJZ65R+32MREcmhdSYtpj3//RO9GrsurbsoQKTUH33o= 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=csmmnHdO; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="csmmnHdO" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a7786d7895so19957025ad.1 for ; Sat, 24 Jan 2026 02:52:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769251929; x=1769856729; 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=97+wvAR7vSL2hQOkz8tJI+iHkohzQNf97h734mRTrKo=; b=csmmnHdOQL5dLxOzruKH6PlgPpuuNQi14odwwJtQg+5Y9f21W8VBdSDLmF8y88BDM1 y86cbv72e2YYHMY1rgjyoUWfd+yEpJmT0WAVsBlH4ccXXWw7RkRwtzjIK+3iZWqx8Yva P0iOtttau6wyYGLUbiY7/W0NOJveGF9S3EssntSOml9V5suoWAtpNQoGd8TG3gh+UILP QdNghYe6JnESZrJijAaYmbKUGyIxmajzfZTrBZhO8XmCP09ErtDZdfy6nfRHlMq0y6aP HAZ2ABs3M19cnXpj832uLNboBX+z/DB8VUE9EXqTkAmKUZK6WQgon3Creav9IwrrVZK+ Lifw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769251929; x=1769856729; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=97+wvAR7vSL2hQOkz8tJI+iHkohzQNf97h734mRTrKo=; b=xVVkc01Rx2BdpATOGdEGD73xG3fF1ekNFRJyUKTxmkzODQUIHu4bqcXAp3LSdqyauS uV7iAvS6Ptxw7DBAhFCBV/ZebrWVlusEhaL1Xv/TBuyClRpDnipXDsrKNG7NCVWfFA1X 2IpCmVcNL/oVLQsdlh+fl7MWaTNBzrR276lL4O3WVsoEe2hSilLy/hyOXbQau4UqJENn rDOttGqZoAjslvaaavW87XWI+AHkUUwFJov5GGtXmb+13Y4VXRVUSdXfo31JmJvlEVnC e3sjLmPlMxhsUhruoKAORPzOqTs16wfqs6oJdei2SHhfu5AES6U57LpEGiksJlcNXJLk rZ0A== X-Forwarded-Encrypted: i=1; AJvYcCV0lJbJmRo6VZV6iVHiKfbaTzdyxy2uOmjVGkXUmgj8Aq8b7i+M+1MUeAFYAo07OSjq25Yh2kd6aLOgizo=@vger.kernel.org X-Gm-Message-State: AOJu0YyzNdhCXwZseDWPSluQkMj5sm9Jc+2SNHBH6cHq8oIGvXVMCnit jM8kYDZaGn+mawCYXfILF7gI5jmQsrQ36Wp08UAGcHrNDlEJ/cMcDp8EeNSLSg== X-Gm-Gg: AZuq6aJDmbG9aRn68qpSDFdoiH0lkEX1W+UoAez3b+y2koGG6/ysx1IW7uwUYVhj0Ks 9j9+ozdsmreiI22sxIwmEVBC7ot+Oyy5EpZ7w9TEv3TnIKpljo1MM/iHa3xVDokUzSrS1iSU5eD iqeMbVpTtl5jdDzuzdWrVcOaYi4TwPpjTw50cWXKZtMgxJKP7jZ5xB0oB8MmL7cOPTP5hyD3hpK t57jOvWW3+paxXBqtNme1INIML0ktFMTy7hdNQOn7dFCoiEN+WWBxABkZkAOcQyhqSlVzaKdcb/ 6D5XQt9ZkbiBEXSswimq6fHpmr+a+52waPi4xM2/NnbhKIEXBUG3IlvGPD77rJTwMKmx+83qeU/ qKbEv2oPJuUDp4mEjhPNsLRVfhAmCf7oNtCMDjeuL3D80q/xI0C7lBBrRSnnlOI9BGo/IGB3gIB lQC7bNPTGUR6dyAOS3Zrp85K0ZwaEzp5j2 X-Received: by 2002:a17:903:2351:b0:2a7:88d2:dd9d with SMTP id d9443c01a7336-2a7fe625dc0mr58381945ad.31.1769251928706; Sat, 24 Jan 2026 02:52:08 -0800 (PST) Received: from tehuang-Alienware-m16-R2.. ([50.47.240.160]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802de5cd4sm42468985ad.40.2026.01.24.02.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jan 2026 02:52:08 -0800 (PST) From: Michael Huang To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Huang Subject: [PATCH v4 1/2] staging: rtl8723bs: refactor nested loops to reduce indentation Date: Sat, 24 Jan 2026 02:49:19 -0800 Message-ID: <20260124104920.5721-2-tehsiu.huang@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260124104920.5721-1-tehsiu.huang@gmail.com> References: <20260123211904.64589-1-tehsiu.huang@gmail.com> <20260124104920.5721-1-tehsiu.huang@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" Use guard clauses (continue statements) to flatten the logic in rtw_mlme_ext.c. This improves code readability by reducing deep nesting levels. Signed-off-by: Michael Huang --- Changes in v4: - Fix canonical patch format by moving the changelog below the "---" line. - Initial public submission (corrected versioning). Changes in v3: - Fix line wrapping in commit description (under 75 chars). - Properly align multi-line function parameters. - Remove unnecessary parentheses. - Add missing Signed-off-by tag. drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index fa1e3ad59254..0ab3629608ce 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3682,32 +3682,31 @@ static void issue_action_BSSCoexistPacket(struct ad= apter *padapter) spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); - for (i =3D 0; i < 8; i++) { - if (ICS[i][0] =3D=3D 1) { - int j, k =3D 0; + int j, k =3D 0; - InfoContent[k] =3D i; - /* SET_BSS_INTOLERANT_ELE_REG_CLASS(InfoContent, i); */ - k++; + if (ICS[i][0] !=3D 1) + continue; - for (j =3D 1; j <=3D 14; j++) { - if (ICS[i][j] =3D=3D 1) { - if (k < 16) { - InfoContent[k] =3D j; /* channel number */ - /* SET_BSS_INTOLERANT_ELE_CHANNEL(InfoContent+k, j); */ - k++; - } - } - } + InfoContent[k] =3D i; + /* SET_BSS_INTOLERANT_ELE_REG_CLASS(InfoContent, i); */ + k++; - pframe =3D rtw_set_ie(pframe, WLAN_EID_BSS_INTOLERANT_CHL_REPORT, k, I= nfoContent, &(pattrib->pktlen)); + for (j =3D 1; j <=3D 14; j++) { + if (ICS[i][j] !=3D 1) + continue; + if (k < 16) { + InfoContent[k] =3D j; /* channel number */ + /* SET_BSS_INTOLERANT_ELE_CHANNEL(InfoContent+k, j); */ + k++; + } } + pframe =3D rtw_set_ie(pframe, + WLAN_EID_BSS_INTOLERANT_CHL_REPORT, + k, InfoContent, &pattrib->pktlen); } - - } @@ -3831,14 +3830,24 @@ void site_survey(struct adapter *padapter) int i; for (i =3D 0; i < RTW_SSID_SCAN_AMOUNT; i++) { - if (pmlmeext->sitesurvey_res.ssid[i].ssid_length) { - /* IOT issue, When wifi_spec is not set, send one probe req without = WPS IE. */ - if (padapter->registrypriv.wifi_spec) - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); - else - issue_probereq_ex(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NU= LL, 0, 0, 0, 0); - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); - } + if (!pmlmeext->sitesurvey_res.ssid[i].ssid_length) + continue; + + /* IOT issue, When wifi_spec is not set. */ + /* Send one probe req without WPS IE. */ + if (padapter->registrypriv.wifi_spec) + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL); + else + issue_probereq_ex(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, + 0, 0, 0, 0); + + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL); } if (pmlmeext->sitesurvey_res.scan_mode =3D=3D SCAN_ACTIVE) { -- 2.43.0 From nobody Sat Feb 7 06:13:55 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 E0433258CE5 for ; Sat, 24 Jan 2026 10:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769251933; cv=none; b=rEDkWtQPIqmNlLKOGy9EER9NQeue5Y2uf2vFUEKghNJ+RZ2B5oDui+Pb0rO2Na+BsKclxqmtTVWhe/QsU6E3avpMbwt+FVOD18ieDv9ckbvbMVx5TY2Z0OWfmWaEB2aSy8lt7cviBFeaIzxLMiN2cLVUur9jvXCKZ1pcZ3zXNEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769251933; c=relaxed/simple; bh=hQFfkIriyYzMEDnBEfzLyP+bxMoyMHWs4T3RNgbBU4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FOAtix/c4WTO8guB11q3VLb2XXuy9XSUata9zge8x/PWBhtOCA2cUPSO7JW5eWK3VATHWPTW7sELqKkzJCKNzyCVXR8RoEEcj6kktZs1kBkslKwJ7cQfBKpKerYSZnW7cu+BZ0OgW8v7LqcMbqQ6xGHenOj7mRNrxVGviRqQyDI= 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=fiRSptPl; arc=none smtp.client-ip=209.85.214.181 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="fiRSptPl" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a102494058so20155015ad.0 for ; Sat, 24 Jan 2026 02:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769251931; x=1769856731; 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=w44jX1+sppLkgDk00+rQsAGRmhfR3Zu5ZIfROqDd/Gw=; b=fiRSptPlsThhqnLVBiHjAB+XN+4kvASK8lZnSrs4saQNNj+47Y8Gqn3rgxkgroR7Px DQLxKa9IkxY98qspSpiJIjQ8iAfw8NUFDbnXXXW1DiYaP6PXtPSqLo3Yk4aJwrUiZrgk oq1lXDUdY1SvL6vvCfLNx/8+nvB9cLWNvrRYElM7aiaG+zyYOlRsvlZlzTltlXPwEIW7 hEgvqhgtmNKkD2JXF+wGOe5ePBHkQmMlnKyeDe9zxXfDrGPUgkKIxvGEduq6ygtiJoHu iRcIO/dYmaTfokEE693ZWkYardp9IvmJTMeIzgDyGQ6AmRZjKG+KFitUV1OH74xEdm6J XVKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769251931; x=1769856731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=w44jX1+sppLkgDk00+rQsAGRmhfR3Zu5ZIfROqDd/Gw=; b=t1ZDNi46+Tq78OQ/w/aEnlpw/1UKFkpRgrQuenBkL8WyJtxkwfemgiqzGq/iOgc2w2 EXlQ6AeOekki8SorNDWQWdf2goJE3eeq0IcF9EPkGy3nmJIRCmX+o5+cZg+/MHsq11kr LXaeIj/+EOGh7i5mjplbaYaOU+Cgtj0LnRjS+9zlRM/i5u7M0wxTGCrYwr/sUqr3h8bc ZMJIBXH+/Q9LcA8HVqBGPvy2PyGX6JEeKk0wvZWUVCMvT7yA+rLqM7DIc1xSEW59PAMY rqc7BQiP1HcL6rUz2h7r4wtN9J6uSjgiZkMvZqLqDZ/3/1yYKKzeX7Vg9dk3yhTyBtqz lgfA== X-Forwarded-Encrypted: i=1; AJvYcCVBQPFiX2+adoJiLlgMMZ6eXJQydaj41l04Kvxo/4Ltp+Xp18eainJyDt1JXSWc17l4xIhoSiY71yCivvw=@vger.kernel.org X-Gm-Message-State: AOJu0YzLe9kdDncJCakJQuf6mYmAkdxIE0Tglp93sv1dKALFPsTPzHwm MyrtfJDYgTIe314kghRwwyfW8KW/WPcNa3UNIe+XVsr7+zcRzVwppSBsJPhNFQ== X-Gm-Gg: AZuq6aIxWV/OwsJfbrevYKxN5N5mf3xHwyXVrJNj90XnrjwdA8Rs9IQL/S4fvRz854e u4I3NorCaLGAtVefFEVD3fKjvHyQJEsxK/oF+dqfcS+2OR0tBTW1vwfMTKVVdu5xww7IUpLoOPH eY8mj5AStoS5GaZRUDDcH/AbYitd7EYqoG3r7fO9Lnvi+aS04BmpX6RtVF/K6AwlDPMEpH+vxDq 07STlB70xpiQ/2rVCEDrZuchULkv2n+vhHl18tNlVBqkggr3SdU9Y2X4uPTzSEFhSLr78JnwYMy oh1rfofDroTzjMfdRo6cO5cqX2hGVLa+sCzqvUE6ndeiTiQUdoC62DHMjvubDS7bpV8P7GhOAeF IVAMqqfrhVt5oC8WJ3Ug3kzHhzZ3ss/eN/qvug24KhYCI/t2/iLbQDEjtRbb4ScVdF/3epYpUre ByxYiY3JoM1R8CChAiF+mbwRKkn+Nf/JuK X-Received: by 2002:a17:903:f8e:b0:2a7:9163:8e60 with SMTP id d9443c01a7336-2a7fe80fddfmr52834715ad.23.1769251931160; Sat, 24 Jan 2026 02:52:11 -0800 (PST) Received: from tehuang-Alienware-m16-R2.. ([50.47.240.160]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802de5cd4sm42468985ad.40.2026.01.24.02.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jan 2026 02:52:10 -0800 (PST) From: Michael Huang To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Huang Subject: [PATCH v4 2/2] staging: rtl8723bs: fix line length and coding style issues Date: Sat, 24 Jan 2026 02:49:20 -0800 Message-ID: <20260124104920.5721-3-tehsiu.huang@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260124104920.5721-1-tehsiu.huang@gmail.com> References: <20260123211904.64589-1-tehsiu.huang@gmail.com> <20260124104920.5721-1-tehsiu.huang@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.pl warnings regarding line length exceeding 100 columns, white spaces, and unnecessary braces in rtw_mlme_ext.c. Signed-off-by: Michael Huang --- Changes in v4: - Fix canonical patch format by moving the changelog below the "---" line. - Initial public submission (corrected versioning). Changes in v3: - Fix line wrapping in commit description (under 75 chars). - Fix line length exceeding 100 columns in comments. - Add missing Signed-off-by tag. drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 81 ++++++++++--------- 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 0ab3629608ce..848d503ffd1d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1120,11 +1120,10 @@ unsigned int OnAssocReq(struct adapter *padapter, u= nion recv_frame *precv_frame) pstat->flags &=3D ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS); if (!wpa_ie) { - if (elems.wps_ie) { + if (elems.wps_ie) pstat->flags |=3D WLAN_STA_WPS; - } else { + else pstat->flags |=3D WLAN_STA_MAYBE_WPS; - } /* AP support WPA/RSN, and sta is going to do WPS, but AP is not ready = */ @@ -4939,7 +4938,9 @@ void _linked_info_dump(struct adapter *padapter) if (padapter->bLinkInfoDump) { if ((pmlmeinfo->state&0x03) =3D=3D WIFI_FW_STATION_STATE) - rtw_hal_get_def_var(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &Undeco= ratedSmoothedPWDB); + rtw_hal_get_def_var(padapter, + HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, + &UndecoratedSmoothedPWDB); for (i =3D 0; i < NUM_STA; i++) { if (pdvobj->macid[i]) { @@ -4978,7 +4979,6 @@ void linked_status_chk(struct adapter *padapter) struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct sta_priv *pstapriv =3D &padapter->stapriv; - if (is_client_associated_to_ap(padapter)) { /* linked infrastructure client mode */ @@ -4994,7 +4994,8 @@ void linked_status_chk(struct adapter *padapter) link_count_limit =3D 7; /* 16 sec */ /* Marked by Kurt 20130715 */ - /* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming,= so we could not check rx limit that strictly. */ + /* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming,= */ + /* so we could not check rx limit that strictly. */ /* todo: To check why we under miracast session, rx_chk would be false = */ psta =3D rtw_get_stainfo(pstapriv, pmlmeinfo->network.mac_address); if (psta) { @@ -5007,9 +5008,18 @@ void linked_status_chk(struct adapter *padapter) { if (rx_chk !=3D _SUCCESS) { if (pmlmeext->retry =3D=3D 0) { - issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, pmlmeinfo->net= work.mac_address, 0, 0, 0, 0); - issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, pmlmeinfo->net= work.mac_address, 0, 0, 0, 0); - issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, pmlmeinfo->net= work.mac_address, 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeinfo->network.ssid, + pmlmeinfo->network.mac_address, + 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeinfo->network.ssid, + pmlmeinfo->network.mac_address, + 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeinfo->network.ssid, + pmlmeinfo->network.mac_address, + 0, 0, 0, 0); } } @@ -5033,7 +5043,7 @@ void linked_status_chk(struct adapter *padapter) } if (tx_chk =3D=3D _FAIL) { - pmlmeinfo->link_count %=3D (link_count_limit+1); + pmlmeinfo->link_count %=3D (link_count_limit + 1); } else { pxmitpriv->last_tx_pkts =3D pxmitpriv->tx_pkts; pmlmeinfo->link_count =3D 0; @@ -5051,7 +5061,6 @@ void linked_status_chk(struct adapter *padapter) continue; if (pmlmeinfo->FW_sta_info[i].rx_pkt =3D=3D sta_rx_pkts(psta)) { - if (pmlmeinfo->FW_sta_info[i].retry < 3) { pmlmeinfo->FW_sta_info[i].retry++; } else { @@ -5069,9 +5078,7 @@ void linked_status_chk(struct adapter *padapter) } /* set_link_timer(pmlmeext, DISCONNECT_TO); */ - } - } void survey_timer_hdl(struct timer_list *t) @@ -5195,7 +5202,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) type =3D _HW_STATE_AP_; /* start_ap_mode(padapter); */ } else if (psetop->mode =3D=3D Ndis802_11Infrastructure) { - pmlmeinfo->state &=3D ~(BIT(0)|BIT(1));/* clear state */ + pmlmeinfo->state &=3D ~(BIT(0) | BIT(1));/* clear state */ pmlmeinfo->state |=3D WIFI_FW_STATION_STATE;/* set to STATION_STATE */ type =3D _HW_STATE_STATION_; } else if (psetop->mode =3D=3D Ndis802_11IBSS) { @@ -5214,7 +5221,6 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) } return H2C_SUCCESS; - } u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) @@ -5518,8 +5524,11 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *= pbuf) for (i =3D 0; i < RTW_SSID_SCAN_AMOUNT; i++) { if (pparm->ssid[i].ssid_length) { - memcpy(pmlmeext->sitesurvey_res.ssid[i].ssid, pparm->ssid[i].ssid, IW_= ESSID_MAX_SIZE); - pmlmeext->sitesurvey_res.ssid[i].ssid_length =3D pparm->ssid[i].ssid_l= ength; + memcpy(pmlmeext->sitesurvey_res.ssid[i].ssid, + pparm->ssid[i].ssid, + IW_ESSID_MAX_SIZE); + pmlmeext->sitesurvey_res.ssid[i].ssid_length =3D + pparm->ssid[i].ssid_length; } else { pmlmeext->sitesurvey_res.ssid[i].ssid_length =3D 0; } @@ -5547,7 +5556,8 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *p= buf) } } - if ((pmlmeext->sitesurvey_res.state =3D=3D SCAN_START) || (pmlmeext->site= survey_res.state =3D=3D SCAN_TXNULL)) { + if ((pmlmeext->sitesurvey_res.state =3D=3D SCAN_START) || + (pmlmeext->sitesurvey_res.state =3D=3D SCAN_TXNULL)) { /* disable dynamic functions, such as high power, DIG */ Save_DM_Func_Flag(padapter); Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); @@ -5571,7 +5581,6 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *p= buf) site_survey(padapter); return H2C_SUCCESS; - } u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf) @@ -5701,7 +5710,6 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char= *pbuf) return H2C_SUCCESS; } - u8 chk_bmc_sleepq_cmd(struct adapter *padapter) { struct cmd_obj *ph2c; @@ -5747,8 +5755,8 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(struct w= lan_bssid_ex)); - len_diff =3D update_hidden_ssid(ptxBeacon_parm->network.ies+_BEACON_IE_OF= FSET_, - ptxBeacon_parm->network.ie_length-_BEACON_IE_OFFSET_, + len_diff =3D update_hidden_ssid(ptxBeacon_parm->network.ies + _BEACON_IE_= OFFSET_, + ptxBeacon_parm->network.ie_length - _BEACON_IE_OFFSET_, pmlmeinfo->hidden_ssid_mode); ptxBeacon_parm->network.ie_length +=3D len_diff; @@ -5803,8 +5811,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned ch= ar *pbuf) goto _abort_event_; peventbuf =3D (uint *)pbuf; - evt_sz =3D (u16)(*peventbuf&0xffff); - evt_code =3D (u8)((*peventbuf>>16)&0xff); + evt_sz =3D (u16)(*peventbuf & 0xffff); + evt_code =3D (u8)((*peventbuf >> 16) & 0xff); /* checking if event code is valid */ if (evt_code >=3D MAX_C2HEVT) @@ -5812,7 +5820,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned ch= ar *pbuf) /* checking if event size match the event parm size */ if ((wlanevents[evt_code].parmsize !=3D 0) && - (wlanevents[evt_code].parmsize !=3D evt_sz)) + (wlanevents[evt_code].parmsize !=3D evt_sz)) goto _abort_event_; atomic_inc(&pevt_priv->event_seq); @@ -5826,12 +5834,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned c= har *pbuf) pevt_priv->evt_done_cnt++; } - _abort_event_: - - return H2C_SUCCESS; - } u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf) @@ -5855,7 +5859,7 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsig= ned char *pbuf) if (!psta_bmc) return H2C_SUCCESS; - if ((pstapriv->tim_bitmap&BIT(0)) && (psta_bmc->sleepq_len > 0)) { + if ((pstapriv->tim_bitmap & BIT(0)) && (psta_bmc->sleepq_len > 0)) { msleep(10);/* 10ms, ATIM(HIQ) Windows */ /* spin_lock_bh(&psta_bmc->sleep_q.lock); */ @@ -5954,8 +5958,13 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned= char *pbuf) setChannelPlan_param =3D (struct SetChannelPlan_param *)pbuf; - pmlmeext->max_chan_nums =3D init_channel_set(padapter, setChannelPlan_par= am->channel_plan, pmlmeext->channel_set); - init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_num= s, &pmlmeext->channel_list); + pmlmeext->max_chan_nums =3D init_channel_set(padapter, + setChannelPlan_param->channel_plan, + pmlmeext->channel_set); + init_channel_list(padapter, + pmlmeext->channel_set, + pmlmeext->max_chan_nums, + &pmlmeext->channel_list); if (padapter->rtw_wdev && padapter->rtw_wdev->wiphy) { struct regulatory_request request; @@ -5975,9 +5984,10 @@ u8 set_csa_hdl(struct adapter *padapter, unsigned ch= ar *pbuf) /* TDLS_ESTABLISHED : write RCR DATA BIT */ /* TDLS_CS_OFF : go back to the channel linked with AP, terminating chan= nel switch procedure */ /* TDLS_INIT_CH_SEN : init channel sensing, receive all data and mgnt fra= me */ -/* TDLS_DONE_CH_SEN: channel sensing and report candidate channel */ +/* TDLS_DONE_CH_SEN : channel sensing and report candidate channel */ /* TDLS_OFF_CH : first time set channel to off channel */ -/* TDLS_BASE_CH : go back tp the channel linked with AP when set base ch= annel as target channel */ +/* TDLS_BASE_CH : go back tp the channel linked with AP when set */ +/* base channel as target channel */ /* TDLS_P_OFF_CH : periodically go to off channel */ /* TDLS_P_BASE_CH : periodically go back to base channel */ /* TDLS_RS_RCR : restore RCR */ @@ -5991,8 +6001,7 @@ u8 run_in_thread_hdl(struct adapter *padapter, u8 *pb= uf) { struct RunInThread_param *p; - - if (pbuf =3D=3D NULL) + if (!pbuf) return H2C_PARAMETERS_ERROR; p =3D (struct RunInThread_param *)pbuf; -- 2.43.0