From nobody Mon Apr 27 02:03:56 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 3236FC43334 for ; Sat, 18 Jun 2022 20:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230525AbiFRUpR (ORCPT ); Sat, 18 Jun 2022 16:45:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbiFRUpO (ORCPT ); Sat, 18 Jun 2022 16:45:14 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4530313DD8 for ; Sat, 18 Jun 2022 13:45:13 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id r1so6565221plo.10 for ; Sat, 18 Jun 2022 13:45:13 -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:mime-version :content-transfer-encoding; bh=gKaVM+0QMGax/rhBtZVVyBor0BK65j3JTrJ7MKdrLpk=; b=RPGhczN7etWK46U3ehU0iRJFtb/x2LggYWn7KPmol85I0Mwp0qk2VjDzFuWEBBmYUk R+4nm9Vs++3/EVRAz9Y/4jgXnNu13bGmxWtIjrgGpvOxBXGyKzbzohrKZ+jNcMy3OMQW W5HxNyO5JsOabU4prXYsSFHuX4B7DfmqEiPjNkMq1Qz/JGki9wrJacxfAcNRqQZkQP7c xPk1TZs39GzVg644pSulLPeTtsxHZFQwFnsTjbugRepwzBgEoc4N1UMxGloPmb2V+nHU Uz7m5Vea3gmER+MTG6ZPvkD+56MgKbLg5zdMN+4PINrDk5Av2yp10skIK3kIK9cCW7gG OrOQ== 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:mime-version :content-transfer-encoding; bh=gKaVM+0QMGax/rhBtZVVyBor0BK65j3JTrJ7MKdrLpk=; b=qiYt50OFO6Tny3UoB8sVDFQ8UUzp1hrTa968n1pP8WWVzDAyDjSnFrIgmOMBOIu17N 6Yd3yUFWrgdubcxK+B3njyW9tU2SmxKfqPwF+6RvLXGIXGMC2Qcz0nWc0fPzMbkTmVKW t9eftH2iBVstKuRdYO+z/ByYh6bWDC+Q12EzxZw1kMGde9k3Rd+GgoKG1dF3sdo1nKdQ XeGh/NzDG55Yf6+02I8Eno2XKp6N8RnxzdmESq+4wcLdwD9X9nH+PqMlfHPkaPmEScFK abW9fi4LZwtiy/o4bfba3pZ6cmxZDy8ep/JjA1QzYwtTgAY3kTelnQadQIwIpLsO5/2/ ykjA== X-Gm-Message-State: AJIora/JUBV8A8HNCVhrH838vp8aKA3ErDmUYt7E4/fIZlFHVnViV6kx r4cfoh4Bc+DK9AzaAqMYv5Y= X-Google-Smtp-Source: AGRyM1sJil//Af9lvbnYSBnHWR4zmgT9Oxr23a9RzjK/ZAwFQ6haYB5TJtEe6lopkEr9r0lDVg7hhA== X-Received: by 2002:a17:90a:31cf:b0:1c9:f9b8:68c7 with SMTP id j15-20020a17090a31cf00b001c9f9b868c7mr29021287pjf.34.1655585112724; Sat, 18 Jun 2022 13:45:12 -0700 (PDT) Received: from localhost (c-67-180-87-133.hsd1.ca.comcast.net. [67.180.87.133]) by smtp.gmail.com with ESMTPSA id e23-20020a170902ed9700b001678dcb4c5asm5798544plj.100.2022.06.18.13.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 13:45:12 -0700 (PDT) From: Chang Yu To: Larry.Finger@lwfinger.net Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Chang Yu Subject: [PATCH] Staging: r8188eu: core: rtw_xmit: Fixed a few coding style issues Date: Sat, 18 Jun 2022 13:44:54 -0700 Message-Id: <20220618204454.16071-1-marcus.yu.56@gmail.com> X-Mailer: git-send-email 2.36.1 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" Fixed a few coding style issues and spelling errors in the comments. Signed-off-by: Chang Yu --- drivers/staging/r8188eu/core/rtw_xmit.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 3d8e9dea7651..943422141c8b 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -16,16 +16,13 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] =3D { 0x00, 0x00,= 0x00 }; =20 static void _init_txservq(struct tx_servq *ptxservq) { - INIT_LIST_HEAD(&ptxservq->tx_pending); rtw_init_queue(&ptxservq->sta_pending); ptxservq->qcnt =3D 0; - } =20 void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) { - memset((unsigned char *)psta_xmitpriv, 0, sizeof(struct sta_xmit_priv)); spin_lock_init(&psta_xmitpriv->lock); _init_txservq(&psta_xmitpriv->be_q); @@ -34,7 +31,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_x= mitpriv) _init_txservq(&psta_xmitpriv->vo_q); INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz); INIT_LIST_HEAD(&psta_xmitpriv->apsd); - } =20 s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) @@ -300,6 +296,7 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * /* check HT op mode */ if (pattrib->ht_en) { u8 htopmode =3D pmlmeinfo->HT_protection; + if ((pmlmeext->cur_bwmode && (htopmode =3D=3D 2 || htopmode =3D=3D 3))= || (!pmlmeext->cur_bwmode && htopmode =3D=3D 3)) { pattrib->vcs_mode =3D RTS_CTS; @@ -446,10 +443,11 @@ static s32 update_attrib(struct adapter *padapter, st= ruct sk_buff *pkt, struct p =20 pattrib->pktlen =3D pktfile.pkt_len; =20 - if (ETH_P_IP =3D=3D pattrib->ether_type) { + if (pattrib->ether_type =3D=3D ETH_P_IP) { /* The following is for DHCP and ARP packet, we use cck1M to tx these p= ackets and let LPS awake some time */ /* to prevent DHCP protocol fail */ u8 tmp[24]; + _rtw_pktfile_read(&pktfile, &tmp[0], 24); pattrib->dhcp_pkt =3D 0; if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */ @@ -628,7 +626,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, s= truct xmit_frame *pxmitfr if (pframe[1] & 2) /* From Ds =3D=3D 1 */ rtw_secmicappend(&micdata, &pframe[24], 6); else - rtw_secmicappend(&micdata, &pframe[10], 6); + rtw_secmicappend(&micdata, &pframe[10], 6); } else { /* ToDS =3D=3D 0 */ rtw_secmicappend(&micdata, &pframe[4], 6); /* DA */ if (pframe[1] & 2) /* From Ds =3D=3D 1 */ @@ -954,12 +952,11 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct mpdu_len -=3D llc_sz; } =20 - if ((pattrib->icv_len > 0) && (pattrib->bswenc)) { + if ((pattrib->icv_len > 0) && (pattrib->bswenc)) mpdu_len -=3D pattrib->icv_len; - } =20 if (bmcst) { - /* don't do fragment to broadcat/multicast packets */ + /* don't do fragment to broadcast/multicast packets */ mem_sz =3D _rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen); } else { mem_sz =3D _rtw_pktfile_read(&pktfile, pframe, mpdu_len); @@ -1069,7 +1066,6 @@ void rtw_update_protection(struct adapter *padapter, = u8 *ie, uint ie_len) } break; } - } =20 void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmit= frame, int sz) @@ -1316,7 +1312,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmit= priv, struct __queue *pfram rtw_free_xmitframe(pxmitpriv, pxmitframe); } spin_unlock_bh(&pframequeue->lock); - } =20 s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxm= itframe) @@ -1515,7 +1510,6 @@ void rtw_init_hwxmits(struct hw_xmit *phwxmit, int en= try) =20 for (i =3D 0; i < entry; i++, phwxmit++) phwxmit->accnt =3D 0; - } =20 static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **psk= b) @@ -1742,7 +1736,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter= *padapter, struct xmit_fra bool bmcst =3D is_multicast_ether_addr(pattrib->ra); =20 if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) - return ret; + return ret; =20 if (pattrib->psta) psta =3D pattrib->psta; @@ -1770,8 +1764,8 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter= *padapter, struct xmit_fra =20 pstapriv->tim_bitmap |=3D BIT(0);/* */ pstapriv->sta_dz_bitmap |=3D BIT(0); - - update_beacon(padapter, _TIM_IE_, NULL, false);/* tx bc/mc packets afte= r upate bcn */ + /* tx bc/mc packets after update bcn */ + update_beacon(padapter, _TIM_IE_, NULL, false); =20 ret =3D true; } @@ -1821,7 +1815,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter= *padapter, struct xmit_fra pstapriv->tim_bitmap |=3D BIT(psta->aid); =20 if (psta->sleepq_len =3D=3D 1) { - /* upate BCN for TIM IE */ + /* update BCN for TIM IE */ update_beacon(padapter, _TIM_IE_, NULL, false); } } @@ -2090,7 +2084,7 @@ void xmit_delivery_enabled_frames(struct adapter *pad= apter, struct sta_info *pst if ((psta->sleepq_ac_len =3D=3D 0) && (!psta->has_legacy_ac) && (wmmps_a= c)) { pstapriv->tim_bitmap &=3D ~BIT(psta->aid); =20 - /* upate BCN for TIM IE */ + /* update BCN for TIM IE */ update_beacon(padapter, _TIM_IE_, NULL, false); } } --=20 2.36.1