From nobody Fri Jun 19 15:45:16 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 2CE64C433F5 for ; Fri, 1 Apr 2022 19:07:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351479AbiDATJI (ORCPT ); Fri, 1 Apr 2022 15:09:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351477AbiDATJB (ORCPT ); Fri, 1 Apr 2022 15:09:01 -0400 Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1659528A01A for ; Fri, 1 Apr 2022 12:07:11 -0700 (PDT) Received: by mail-qv1-xf2b.google.com with SMTP id f3so2721526qvz.10 for ; Fri, 01 Apr 2022 12:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HZ+3ukPY3keLOSk2pZn5+tiMzNcnjZICwG03+QcVg+c=; b=eVROmo9d3t4RJR624qFPw9jG/CmmnsAe9/iAWdFP1dz3PtLyQNykWLXDtCBLC6wb0b cNA/KTkTnBlBvFdFm9PAnI7olInx1IEE8AVZUQnSekuo1KI7CPtiJd+OVpV77+aeUMSy utpr+7OwSjUWa/Qs2BmC7IIp04APG7up3FKe2Eom6hwV84FfPL3jqYyz1OSMVKy+A9D3 uXs77+xsiaIANIm6X0RSkf0Z2dZSPWKnppXHvkvvBuZj63c1dP8CVakfFYlMKYlnBSin YFw8rBSj7rQ6PzzEfVjAwHVP/jr59/C/GSuIHgSgXJvGRe0zgScxVoxUDUaiozqzi/fG wCUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HZ+3ukPY3keLOSk2pZn5+tiMzNcnjZICwG03+QcVg+c=; b=IzhZ+2APVLcfuoJTjICVdJalIHi8k3Hv4UAim0T3KejbIus/P493tJoeHVme4pOmdh XZfnmlzIY4Di82/B1JR8Xr7j9by/B1YpgDTAHx6ydOyVfV/vbzWhNPoi/dXg7Ix4StQl XA72OZK+PjthBNlFucv150BtI4SMFM/QChq1uQ2OMZpYPyFxbTOmL/XVdrYKnqoHdqDV d1DVcgC0Z+9KRS1cHLuCR8knqleowx385kTnK+JIjPpQ55SxFw+gRvhkdAntdgJbDln9 eq3xm3KM9wDrTux6B7K27XR5NyRzjRde3QBbFCa4jqFf8LLXfI1kCofizbtX6S88VAeN zHiw== X-Gm-Message-State: AOAM531cnlIf5PXw2NqNzM9iPgqyK0WYzrmFRMIxlkkTKbUqABPaRpoi FOWNI+vp7PcyIZ6hajaw3KM= X-Google-Smtp-Source: ABdhPJynFm6+Ex4nuU5kNDGxoCgFVH3lxCz9w9FeD1nSHlc8s1t/XZ16M+lbPQ26CqvI058eG7gqqQ== X-Received: by 2002:a05:6214:20ec:b0:441:8721:83c4 with SMTP id 12-20020a05621420ec00b00441872183c4mr33531483qvk.69.1648840030065; Fri, 01 Apr 2022 12:07:10 -0700 (PDT) Received: from euclid ([71.58.109.160]) by smtp.gmail.com with ESMTPSA id q26-20020ae9e41a000000b0067d1a20872fsm1665593qkc.94.2022.04.01.12.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:07:09 -0700 (PDT) From: Sevinj Aghayeva To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Sevinj Aghayeva Subject: [PATCH 1/3] staging: rtl8723bs: remove redundant braces in if statements Date: Fri, 1 Apr 2022 15:06:57 -0400 Message-Id: <1a9f181f7f30f71c03e6e88df9fb8c17a298a192.1648839305.git.sevinj.aghayeva@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" Adhere to Linux kernel coding style. Reported by checkpatch: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Sevinj Aghayeva --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 76 +++++++------------ 1 file changed, 26 insertions(+), 50 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 49a3f45cb771..9f328e9a81ff 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -271,12 +271,9 @@ static int has_channel(struct rt_channel_info *channel= _set, { int i; =20 - for (i =3D 0; i < chanset_size; i++) { - if (channel_set[i].ChannelNum =3D=3D chan) { + for (i =3D 0; i < chanset_size; i++) + if (channel_set[i].ChannelNum =3D=3D chan) return 1; - } - } - return 0; } =20 @@ -649,9 +646,8 @@ unsigned int OnBeacon(struct adapter *padapter, union r= ecv_frame *precv_frame) if (psta) { /* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon receive= d */ - if ((sta_rx_pkts(psta) & 0xf) =3D=3D 0) { + if ((sta_rx_pkts(psta) & 0xf) =3D=3D 0) update_beacon_info(padapter, pframe, len, psta); - } } else { /* allocate a new CAM entry for IBSS station */ cam_idx =3D allocate_fw_sta_entry(padapter); @@ -916,11 +912,10 @@ unsigned int OnAuthClient(struct adapter *padapter, u= nion recv_frame *precv_fram go2asoc =3D 1; } } else if (seq =3D=3D 4) { - if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) { + if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) go2asoc =3D 1; - } else { + else goto authclnt_fail; - } } else { /* this is also illegal */ goto authclnt_fail; @@ -1455,11 +1450,10 @@ unsigned int OnAssocRsp(struct adapter *padapter, u= nion recv_frame *precv_frame) UpdateBrateTbl(padapter, pmlmeinfo->network.supported_rates); =20 report_assoc_result: - if (res > 0) { + if (res > 0) rtw_buf_update(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, pframe,= pkt_len); - } else { + else rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len); - } =20 report_join_res(padapter, res); =20 @@ -1531,9 +1525,8 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) reason, GetAddr3Ptr(pframe), ignore_received_deauth); =20 - if (0 =3D=3D ignore_received_deauth) { + if (0 =3D=3D ignore_received_deauth) receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); - } } pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; return _SUCCESS; @@ -1674,11 +1667,10 @@ unsigned int OnAction_back(struct adapter *padapter= , union recv_frame *precv_fra /* process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), GetAddr3P= tr(pframe)); */ process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr); =20 - if (pmlmeinfo->accept_addba_req) { + if (pmlmeinfo->accept_addba_req) issue_action_BA(padapter, addr, WLAN_ACTION_ADDBA_RESP, 0); - } else { + else issue_action_BA(padapter, addr, WLAN_ACTION_ADDBA_RESP, 37);/* reject = ADDBA Req */ - } =20 break; =20 @@ -1774,9 +1766,8 @@ static unsigned int on_action_public_vendor(union rec= v_frame *precv_frame) u8 *pframe =3D precv_frame->u.hdr.rx_data; u8 *frame_body =3D pframe + sizeof(struct ieee80211_hdr_3addr); =20 - if (!memcmp(frame_body + 2, P2P_OUI, 4)) { + if (!memcmp(frame_body + 2, P2P_OUI, 4)) ret =3D on_action_public_p2p(precv_frame); - } =20 return ret; } @@ -2187,9 +2178,8 @@ void issue_beacon(struct adapter *padapter, int timeo= ut_ms) =20 wps_ie =3D rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(str= uct ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_, pattrib->pktlen-sizeof(struct ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_,= NULL, &wps_ielen); - if (wps_ie && wps_ielen > 0) { + if (wps_ie && wps_ielen > 0) rtw_get_wps_attr_content(wps_ie, wps_ielen, WPS_ATTR_SELECTED_REGISTR= AR, (u8 *)(&sr), NULL); - } if (sr !=3D 0) set_fwstate(pmlmepriv, WIFI_UNDER_WPS); else @@ -2245,9 +2235,8 @@ void issue_beacon(struct adapter *padapter, int timeo= ut_ms) =20 =20 /* EXTERNDED SUPPORTED RATE */ - if (rate_len > 8) { + if (rate_len > 8) pframe =3D rtw_set_ie(pframe, WLAN_EID_EXT_SUPP_RATES, (rate_len - 8), (= cur_network->supported_rates + 8), &pattrib->pktlen); - } =20 =20 /* todo:HT for adhoc */ @@ -2447,9 +2436,8 @@ void issue_probersp(struct adapter *padapter, unsigne= d char *da, u8 is_valid_p2p =20 =20 /* EXTERNDED SUPPORTED RATE */ - if (rate_len > 8) { + if (rate_len > 8) pframe =3D rtw_set_ie(pframe, WLAN_EID_EXT_SUPP_RATES, (rate_len - 8), = (cur_network->supported_rates + 8), &pattrib->pktlen); - } =20 =20 /* todo:HT for adhoc */ @@ -2674,9 +2662,8 @@ void issue_auth(struct adapter *padapter, struct sta_= info *psta, unsigned short =20 /* setting auth algo number */ val16 =3D (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) ? 1 : 0;= /* 0:OPEN System, 1:Shared key */ - if (val16) { + if (val16) use_shared_key =3D 1; - } le_tmp =3D cpu_to_le16(val16); =20 /* setting IV for auth seq #3 */ @@ -2831,16 +2818,14 @@ void issue_asocrsp(struct adapter *padapter, unsign= ed short status, struct sta_i break; } =20 - if (!pbuf || ie_len =3D=3D 0) { + if (!pbuf || ie_len =3D=3D 0) break; - } } =20 } =20 - if (pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_REALTEK) { + if (pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_REALTEK) pframe =3D rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, 6, REALTEK_96B_I= E, &(pattrib->pktlen)); - } =20 /* add WPS IE ie for wps 2.0 */ if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len > 0)= { @@ -3301,9 +3286,8 @@ static int _issue_deauth(struct adapter *padapter, un= signed char *da, __le16 le_tmp; =20 pmgntframe =3D alloc_mgtxmitframe(pxmitpriv); - if (!pmgntframe) { + if (!pmgntframe) goto exit; - } =20 /* update attribute */ pattrib =3D &pmgntframe->attrib; @@ -3627,9 +3611,8 @@ static void issue_action_BSSCoexistPacket(struct adap= ter *padapter) action =3D ACT_PUBLIC_BSSCOEXIST; =20 pmgntframe =3D alloc_mgtxmitframe(pxmitpriv); - if (!pmgntframe) { + if (!pmgntframe) return; - } =20 /* update attribute */ pattrib =3D &pmgntframe->attrib; @@ -3802,9 +3785,8 @@ unsigned int send_beacon(struct adapter *padapter) =20 } while (false =3D=3D bxmitok && issue < 100 && !padapter->bSurpriseRemov= ed && !padapter->bDriverStopped); =20 - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) { + if (padapter->bSurpriseRemoved || padapter->bDriverStopped) return _FAIL; - } =20 =20 if (!bxmitok) @@ -4388,9 +4370,8 @@ static void process_80211d(struct adapter *padapter, = struct wlan_bssid_ex *bssid } =20 /* skip AP 2.4G channel plan */ - while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <=3D 14)) { + while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <=3D 14)) j++; - } } =20 pmlmeext->update_channel_plan_by_ap_done =3D 1; @@ -4402,9 +4383,8 @@ static void process_80211d(struct adapter *padapter, = struct wlan_bssid_ex *bssid i =3D 0; while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum !=3D 0)) { if (chplan_new[i].ChannelNum =3D=3D channel) { - if (chplan_new[i].ScanType =3D=3D SCAN_PASSIVE) { + if (chplan_new[i].ScanType =3D=3D SCAN_PASSIVE) chplan_new[i].ScanType =3D SCAN_ACTIVE; - } break; } i++; @@ -4629,9 +4609,8 @@ void report_del_sta_event(struct adapter *padapter, u= nsigned char *MacAddr, unsi struct cmd_priv *pcmdpriv =3D &padapter->cmdpriv; =20 pcmd_obj =3D rtw_zmalloc(sizeof(struct cmd_obj)); - if (!pcmd_obj) { + if (!pcmd_obj) return; - } =20 cmdsz =3D (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header)); pevtcmd =3D rtw_zmalloc(cmdsz); @@ -5124,9 +5103,8 @@ void survey_timer_hdl(struct timer_list *t) =20 /* issue rtw_sitesurvey_cmd */ if (pmlmeext->sitesurvey_res.state > SCAN_START) { - if (pmlmeext->sitesurvey_res.state =3D=3D SCAN_PROCESS) { + if (pmlmeext->sitesurvey_res.state =3D=3D SCAN_PROCESS) pmlmeext->sitesurvey_res.channel_idx++; - } =20 if (pmlmeext->scan_abort) { pmlmeext->sitesurvey_res.channel_idx =3D pmlmeext->sitesurvey_res.ch_nu= m; @@ -5135,9 +5113,8 @@ void survey_timer_hdl(struct timer_list *t) } =20 ph2c =3D rtw_zmalloc(sizeof(struct cmd_obj)); - if (!ph2c) { + if (!ph2c) goto exit_survey_timer_hdl; - } =20 psurveyPara =3D rtw_zmalloc(sizeof(struct sitesurvey_parm)); if (!psurveyPara) { @@ -5348,9 +5325,8 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) =20 /* check already connecting to AP or not */ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) { - if (pmlmeinfo->state & WIFI_FW_STATION_STATE) { + if (pmlmeinfo->state & WIFI_FW_STATION_STATE) issue_deauth_ex(padapter, pnetwork->mac_address, WLAN_REASON_DEAUTH_LEA= VING, 1, 100); - } pmlmeinfo->state =3D WIFI_FW_NULL_STATE; =20 /* clear CAM */ --=20 2.25.1 From nobody Fri Jun 19 15:45:16 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 51ECDC433EF for ; Fri, 1 Apr 2022 19:07:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351513AbiDATJL (ORCPT ); Fri, 1 Apr 2022 15:09:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351489AbiDATJD (ORCPT ); Fri, 1 Apr 2022 15:09:03 -0400 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D142228A01A for ; Fri, 1 Apr 2022 12:07:12 -0700 (PDT) Received: by mail-qk1-x734.google.com with SMTP id q200so2877182qke.7 for ; Fri, 01 Apr 2022 12:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ajcz12srs583Xws3OY/YngwhdPC9ljyQGLcNQQ87rSE=; b=Pag1x2+B0+jjhMas5lNK5QV2FUt7muYbeFM8cK0TPAC7Q4TWuFpBkKtwFzM0Ltyuf6 2EhQwmQSew9XTS/TaCcyj3mEfKd903oGHHtObTf6xqKOFOyjNcUkw9yNder+UUpnvFKM fVlAckJ3HjfgLJw8c6yfxep1/u0MP8g6U2G+4TEIgU9Zbf+C7DAwWj9IZFteXSa2V8tj AqJcA4p+KCREsZWtDgen3365Fit2VAPfnm57e14Tx1TGKApD9/v5RkRZvm6w1dKWOY2d Fnntj1gGAX/37rQ8YREfnC/I/0h47iKVyfm6R7PJCc4xgFJj1nvBzsso7p082/Aoy6FX OSSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ajcz12srs583Xws3OY/YngwhdPC9ljyQGLcNQQ87rSE=; b=Omo4kXMZv4neUlU3KJJcpsZdB0rRGC6xoCdAuyi/WkoG0YrModYqsHMS/+ReZf09ul kC8GE69m5lSDHONjYBqJCZ0S1Ix8NUmeRBvLckJ1i4sisOXFAESkQMJx6dqoYnlWHPHo b3zNDjJBCY1abrHi2RwtyEvpCQ2SpMwvFKI5wvd4VFn5e89H5F+ptFYqFK7jCG38oRc5 2aZiAnDD3TSxTcUjS7W6x0XQoT17GXtK4PZ4rrVt6UiPa0OnpZnnU8ngC8USkwnum9lw cwGJTheShkR59TCGIpIlPBSb8j5mPA2Vy7BklwMEDoE8rnIqngp9ubsKg0XHdjqVX/DI yNjg== X-Gm-Message-State: AOAM530ZXT3d1jdikGj5v22u+QSP9xPMtArZkFzpVTRAjlEpekSoXiTP RSVtUeMQC0EGmpYJyycqS0g= X-Google-Smtp-Source: ABdhPJxnft1Sc23zQY13aRRbAfBd78kHfPB05ABE+NX0GnNdKPDX5EHNqFyKF3ospa60huPb6Ofbqg== X-Received: by 2002:a05:620a:4541:b0:67e:4bb7:c11b with SMTP id u1-20020a05620a454100b0067e4bb7c11bmr7469279qkp.194.1648840031865; Fri, 01 Apr 2022 12:07:11 -0700 (PDT) Received: from euclid ([71.58.109.160]) by smtp.gmail.com with ESMTPSA id b17-20020a05622a021100b002e1f86db385sm2292334qtx.68.2022.04.01.12.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:07:11 -0700 (PDT) From: Sevinj Aghayeva To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Sevinj Aghayeva Subject: [PATCH 2/3] staging: rtl8723bs: place constants on the right side of tests Date: Fri, 1 Apr 2022 15:06:58 -0400 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" Adhere to Linux kernel coding style. Reported by checkpatch: WARNING: Comparisons should place the constant on the right side of the test Signed-off-by: Sevinj Aghayeva --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 9f328e9a81ff..81e4b1bf68f6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -308,11 +308,11 @@ static void init_channel_list(struct adapter *padapte= r, struct rt_channel_info * if (!has_channel(channel_set, chanset_size, ch)) continue; =20 - if ((0 =3D=3D padapter->registrypriv.ht_enable) && (8 =3D=3D o->inc)) + if ((padapter->registrypriv.ht_enable =3D=3D 0) && (o->inc =3D=3D 8)) continue; =20 - if ((0 < (padapter->registrypriv.bw_mode & 0xf0)) && - ((BW40MINUS =3D=3D o->bw) || (BW40PLUS =3D=3D o->bw))) + if (((padapter->registrypriv.bw_mode & 0xf0) > 0) && + ((o->bw =3D=3D BW40MINUS) || (o->bw =3D=3D BW40PLUS))) continue; =20 if (!reg) { @@ -342,7 +342,7 @@ static u8 init_channel_set(struct adapter *padapter, u8= ChannelPlan, struct rt_c =20 if (is_supported_24g(padapter->registrypriv.wireless_mode)) { b2_4GBand =3D true; - if (RT_CHANNEL_DOMAIN_REALTEK_DEFINE =3D=3D ChannelPlan) + if (ChannelPlan =3D=3D RT_CHANNEL_DOMAIN_REALTEK_DEFINE) Index2G =3D RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index2G; else Index2G =3D RTW_ChannelPlanMap[ChannelPlan].Index2G; @@ -352,14 +352,14 @@ static u8 init_channel_set(struct adapter *padapter, = u8 ChannelPlan, struct rt_c for (index =3D 0; index < RTW_ChannelPlan2G[Index2G].Len; index++) { channel_set[chanset_size].ChannelNum =3D RTW_ChannelPlan2G[Index2G].Cha= nnel[index]; =20 - if ((RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN =3D=3D ChannelPlan) ||/* Channel 1= ~11 is active, and 12~14 is passive */ - (RT_CHANNEL_DOMAIN_GLOBAL_NULL =3D=3D ChannelPlan)) { + if ((ChannelPlan =3D=3D RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN) || /* Channel = 1~11 is active, and 12~14 is passive */ + (ChannelPlan =3D=3D RT_CHANNEL_DOMAIN_GLOBAL_NULL)) { if (channel_set[chanset_size].ChannelNum >=3D 1 && channel_set[chanset= _size].ChannelNum <=3D 11) channel_set[chanset_size].ScanType =3D SCAN_ACTIVE; else if ((channel_set[chanset_size].ChannelNum >=3D 12 && channel_set= [chanset_size].ChannelNum <=3D 14)) channel_set[chanset_size].ScanType =3D SCAN_PASSIVE; - } else if (RT_CHANNEL_DOMAIN_WORLD_WIDE_13 =3D=3D ChannelPlan || - RT_CHANNEL_DOMAIN_2G_WORLD =3D=3D Index2G) { /* channel 12~13, passiv= e scan */ + } else if (ChannelPlan =3D=3D RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || + Index2G =3D=3D RT_CHANNEL_DOMAIN_2G_WORLD) { /* channel 12~13, passive= scan */ if (channel_set[chanset_size].ChannelNum <=3D 11) channel_set[chanset_size].ScanType =3D SCAN_ACTIVE; else @@ -1326,7 +1326,7 @@ unsigned int OnAssocReq(struct adapter *padapter, uni= on recv_frame *precv_frame) spin_unlock_bh(&pstapriv->asoc_list_lock); =20 /* now the station is qualified to join our BSS... */ - if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (WLAN_STATUS_SUCCE= SS =3D=3D status)) { + if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status =3D=3D WLA= N_STATUS_SUCCESS)) { /* 1 bss_cap_update & sta_info_update */ bss_cap_update_on_sta_join(padapter, pstat); sta_info_update(padapter, pstat); @@ -1514,7 +1514,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) { if (reason =3D=3D WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) { ignore_received_deauth =3D 1; - } else if (WLAN_REASON_PREV_AUTH_NOT_VALID =3D=3D reason) { + } else if (reason =3D=3D WLAN_REASON_PREV_AUTH_NOT_VALID) { /* TODO: 802.11r */ ignore_received_deauth =3D 1; } @@ -1525,7 +1525,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) reason, GetAddr3Ptr(pframe), ignore_received_deauth); =20 - if (0 =3D=3D ignore_received_deauth) + if (ignore_received_deauth =3D=3D 0) receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); } pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; @@ -3536,13 +3536,13 @@ void issue_action_BA(struct adapter *padapter, unsi= gned char *raddr, unsigned ch rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); =20 - if (IEEE80211_HT_MAX_AMPDU_64K =3D=3D max_rx_ampdu_factor) + if (max_rx_ampdu_factor =3D=3D IEEE80211_HT_MAX_AMPDU_64K) BA_para_set =3D ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f= ) | 0x1000); /* 64 buffer size */ - else if (IEEE80211_HT_MAX_AMPDU_32K =3D=3D max_rx_ampdu_factor) + else if (max_rx_ampdu_factor =3D=3D IEEE80211_HT_MAX_AMPDU_32K) BA_para_set =3D ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f= ) | 0x0800); /* 32 buffer size */ - else if (IEEE80211_HT_MAX_AMPDU_16K =3D=3D max_rx_ampdu_factor) + else if (max_rx_ampdu_factor =3D=3D IEEE80211_HT_MAX_AMPDU_16K) BA_para_set =3D ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f= ) | 0x0400); /* 16 buffer size */ - else if (IEEE80211_HT_MAX_AMPDU_8K =3D=3D max_rx_ampdu_factor) + else if (max_rx_ampdu_factor =3D=3D IEEE80211_HT_MAX_AMPDU_8K) BA_para_set =3D ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f= ) | 0x0200); /* 8 buffer size */ else BA_para_set =3D ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f= ) | 0x1000); /* 64 buffer size */ @@ -5065,7 +5065,7 @@ void linked_status_chk(struct adapter *padapter) if (pmlmeinfo->FW_sta_info[i].status =3D=3D 1) { psta =3D pmlmeinfo->FW_sta_info[i].psta; =20 - if (NULL =3D=3D psta) + if (psta =3D=3D NULL) continue; =20 if (pmlmeinfo->FW_sta_info[i].rx_pkt =3D=3D sta_rx_pkts(psta)) { @@ -6049,7 +6049,7 @@ u8 run_in_thread_hdl(struct adapter *padapter, u8 *pb= uf) struct RunInThread_param *p; =20 =20 - if (NULL =3D=3D pbuf) + if (pbuf =3D=3D NULL) return H2C_PARAMETERS_ERROR; p =3D (struct RunInThread_param *)pbuf; =20 --=20 2.25.1 From nobody Fri Jun 19 15:45:16 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 CFDEBC433EF for ; Fri, 1 Apr 2022 19:07:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351510AbiDATJQ (ORCPT ); Fri, 1 Apr 2022 15:09:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351505AbiDATJH (ORCPT ); Fri, 1 Apr 2022 15:09:07 -0400 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D72128A035 for ; Fri, 1 Apr 2022 12:07:16 -0700 (PDT) Received: by mail-qk1-x732.google.com with SMTP id d65so2885367qke.5 for ; Fri, 01 Apr 2022 12:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7duh5/e6azg6x7M9ZEJraSnYR2xg1p2mo3IgTU2n19I=; b=APcJEDArJqsnOZqX52DlQofSk6M2o5kXbtnZRnmR4+bMQwuqhC9GbyCQkPWUCDWHpT OjTa9QKc4uR6yJXko6K6zn1nL7B5iFutXY/Lts6BsgNBVevLricqdXdR1FeVpJ9Q+qGa odNRS+gj1i6IZ1qn+MXW19FZEeqj98bhygB6n2ihmYQohknqiaPh8Bkepeyv+WbPLXtF iSAxNrsv/HP1kpjqCgPgcknB4rc5goyMxLLdJrYq1KZkaYBrUFqj3B1X4gsnttBPrvfr cSFfyN+EVJIPVBaqTlld9w5Xp/T5WOY9eMoYwrUgStxAljX6sxKK25KfVGJWuud9iqlW N3hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7duh5/e6azg6x7M9ZEJraSnYR2xg1p2mo3IgTU2n19I=; b=UfOlpVkpelw+N8VpSdYBxfLrRrcMbhJX5xCecIHjqAUhuBejTuQlemK3FMlhznAxy/ PpaF7Qr1c4ploSay5pHFo+PIoUARLxKjqOxb80BJxH19oyC2G+T6ADYuLzvOLzcgjIRv zlQYkb7eH9JrgLvk7yFtxzuvZBwLxelj5OQOVpv9TGbB+LflpTgOaEO7WapAF6M8zFhy oVhezZXeaMAZfz1IAcUzaLTG9tGNNEm2bVkj5HYRYWwAbCUrrVTF8L1QkszSqbRE4cIe /Ra+U9gVgVVKTk4pIV0IqjPEgkt9eoFs+hHi264WkwFG6ULKYs8iWL7njGgo3CgUZ177 Y0PQ== X-Gm-Message-State: AOAM531bbD2MJEoo711jafmKVt29Ki7Vbwr2QoATL6HIPhZmVxndQDZ+ 1RdWX2smP8WXWGpIeZiJlXs= X-Google-Smtp-Source: ABdhPJzgZVBoX9n8hle80mGH6mQBR9zbxOU1a7ngT2sbYX7Q1YBV857k348RMha0AjcM8eAflQSSxw== X-Received: by 2002:a05:620a:410b:b0:67d:d23f:13d5 with SMTP id j11-20020a05620a410b00b0067dd23f13d5mr7670928qko.705.1648840035103; Fri, 01 Apr 2022 12:07:15 -0700 (PDT) Received: from euclid ([71.58.109.160]) by smtp.gmail.com with ESMTPSA id l18-20020a05622a051200b002e1e5e57e0csm2341549qtx.11.2022.04.01.12.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:07:14 -0700 (PDT) From: Sevinj Aghayeva To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Sevinj Aghayeva Subject: [PATCH 3/3] staging: rtl8723bs: remove redundant else branches Date: Fri, 1 Apr 2022 15:07:00 -0400 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" Adhere to Linux kernel coding style. Reported by checkpatch: WARNING: else is not generally useful after a break or return Signed-off-by: Sevinj Aghayeva --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 81e4b1bf68f6..7a941832ee34 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -907,10 +907,9 @@ unsigned int OnAuthClient(struct adapter *padapter, un= ion recv_frame *precv_fram set_link_timer(pmlmeext, REAUTH_TO); =20 return _SUCCESS; - } else { - /* open system */ - go2asoc =3D 1; } + /* open system */ + go2asoc =3D 1; } else if (seq =3D=3D 4) { if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) go2asoc =3D 1; @@ -1467,6 +1466,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); u8 *pframe =3D precv_frame->u.hdr.rx_data; + int ignore_received_deauth =3D 0; =20 /* check A3 */ if (memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_AL= EN)) @@ -1502,32 +1502,31 @@ unsigned int OnDeAuth(struct adapter *padapter, uni= on recv_frame *precv_frame) =20 =20 return _SUCCESS; - } else { - int ignore_received_deauth =3D 0; - - /* Commented by Albert 20130604 */ - /* Before sending the auth frame to start the STA/GC mode connection wi= th AP/GO, */ - /* we will send the deauth first. */ - /* However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason= code 6 to us after receieving our deauth. */ - /* Added the following code to avoid this case. */ - if ((pmlmeinfo->state & WIFI_FW_AUTH_STATE) || - (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) { - if (reason =3D=3D WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) { - ignore_received_deauth =3D 1; - } else if (reason =3D=3D WLAN_REASON_PREV_AUTH_NOT_VALID) { - /* TODO: 802.11r */ - ignore_received_deauth =3D 1; - } + } + + /* Commented by Albert 20130604 */ + /* Before sending the auth frame to start the STA/GC mode connection wit= h AP/GO, */ + /* we will send the deauth first. */ + /* However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason = code 6 to us after receieving our deauth. */ + /* Added the following code to avoid this case. */ + if ((pmlmeinfo->state & WIFI_FW_AUTH_STATE) || + (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) { + if (reason =3D=3D WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) { + ignore_received_deauth =3D 1; + } else if (reason =3D=3D WLAN_REASON_PREV_AUTH_NOT_VALID) { + /* TODO: 802.11r */ + ignore_received_deauth =3D 1; } + } =20 - netdev_dbg(padapter->pnetdev, - "sta recv deauth reason code(%d) sta:%pM, ignore =3D %d\n", - reason, GetAddr3Ptr(pframe), - ignore_received_deauth); + netdev_dbg(padapter->pnetdev, + "sta recv deauth reason code(%d) sta:%pM, ignore =3D %d\n", + reason, GetAddr3Ptr(pframe), + ignore_received_deauth); + + if (ignore_received_deauth =3D=3D 0) + receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); =20 - if (ignore_received_deauth =3D=3D 0) - receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); - } pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; return _SUCCESS; =20 @@ -1574,16 +1573,14 @@ unsigned int OnDisassoc(struct adapter *padapter, u= nion recv_frame *precv_frame) } =20 return _SUCCESS; - } else { - netdev_dbg(padapter->pnetdev, - "sta recv disassoc reason code(%d) sta:%pM\n", - reason, GetAddr3Ptr(pframe)); - - receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); } + netdev_dbg(padapter->pnetdev, + "sta recv disassoc reason code(%d) sta:%pM\n", + reason, GetAddr3Ptr(pframe)); + + receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; return _SUCCESS; - } =20 unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_fram= e) --=20 2.25.1