From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DATE_IN_PAST_12_24, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A0F2C43331 for ; Sat, 28 Mar 2020 16:31:29 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E1202073E for ; Sat, 28 Mar 2020 16:31:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=hurranet.com header.i=aiman.najjar@hurranet.com header.b="Ijdof/BU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E1202073E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hurranet.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D0E1188BA0; Sat, 28 Mar 2020 16:31:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uJC56UcokXCv; Sat, 28 Mar 2020 16:31:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8EF1F88ACE; Sat, 28 Mar 2020 16:31:27 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 046651BF2C9 for ; Sat, 28 Mar 2020 16:31:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0108B88AA9 for ; Sat, 28 Mar 2020 16:31:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vk8zZAgs4O2l for ; Sat, 28 Mar 2020 16:31:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by hemlock.osuosl.org (Postfix) with ESMTPS id 810E588A9E for ; Sat, 28 Mar 2020 16:31:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1585413072; cv=none; d=zohomail.com; s=zohoarc; b=fBrAoAUiblJLmvNrWzx8Qola3brdppKlLIlWeRmwaggANdALblKRh9OcPvHpcvx1AYFRvMwhi+oyMjaF76u4enfr8WEGQFO6KJcd+6vt1GTShGhdAU+JzNy1Efl1PFtfaLzGuNKrgdvdN6OhYYqHGmYR7jgqNhP5BV2T6jIkUJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585413072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=7MjhWFY7QgmsWF9j7BMZskE0eKgnDKHQSHK8EK548Mk=; b=bsN55FAwmFgL18bOmDHP4hRBauT2+P29TTGIuEqAQMVP8OfD+NOAXivVDO5KmHTULwGL4wrnaimx/Cqdn62r6b0FY2h9LkVIhZPFF4SsCzlVPB4xlvq3tNNfbyw86B9LNMDuJKZidV+myjbEDOmA84E0Ds1tfTJ3ZuZDnYYK2fg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=hurranet.com; spf=pass smtp.mailfrom=aiman.najjar@hurranet.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1585413072; s=zoho; d=hurranet.com; i=aiman.najjar@hurranet.com; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=7MjhWFY7QgmsWF9j7BMZskE0eKgnDKHQSHK8EK548Mk=; b=Ijdof/BUuylw/pv3YDzMpEqzB1b6LsDYG8/rloFMczOwoaWa0NQroRvhondYrFrB o6xXOHOXj+kXmkwHyTt1d0raw1ZuT6OI7S+K+ds/vw3CjVPkztyqV573XNUOZTrQrnM 6nioOCfixVSaI2sYn+KqiXuXP3Gpt4d31aTbKzQA= Received: from kernel-dev (097-100-022-132.res.spectrum.com [97.100.22.132]) by mx.zohomail.com with SMTPS id 1585413070732111.22818257289418; Sat, 28 Mar 2020 09:31:10 -0700 (PDT) From: aimannajjar To: Greg Kroah-Hartman Message-ID: <1f14de8f1418df6de270b8b3d07793906db9ffee.1585353747.git.aiman.najjar@hurranet.com> Subject: [PATCH v2 3/5] staging: rtl8712: fix checkpatch warnings Date: Fri, 27 Mar 2020 20:08:09 -0400 X-Mailer: git-send-email 2.20.1 In-Reply-To: References: <20200327080429.GB1627562@kroah.com> MIME-Version: 1.0 X-ZohoMailClient: External X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, aimannajjar , Florian Schilhabel , linux-kernel@vger.kernel.org, Larry Finger Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" This patch fixes multiline dereference warnings in rtl871x_xmit.c: WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrptxmickey' 379: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:379: + psecuritypriv-> + XGrptxmickey[psecuritypriv-> WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 380: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:380: + XGrptxmickey[psecuritypriv-> + XGrpKeyid].skey); Signed-off-by: aimannajjar --- drivers/staging/rtl8712/rtl871x_xmit.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index 454c26f83406..0f789c821552 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -351,7 +351,7 @@ static int xmitframe_addmic(struct _adapter *padapter, struct sta_info *stainfo; struct qos_priv *pqospriv = &(padapter->mlmepriv.qospriv); struct pkt_attrib *pattrib = &pxmitframe->attrib; - struct security_priv *psecuritypriv = &padapter->securitypriv; + struct security_priv *psecpriv = &padapter->securitypriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; u8 priority[4] = {0x0, 0x0, 0x0, 0x0}; bool bmcst = is_multicast_ether_addr(pattrib->ra); @@ -369,15 +369,14 @@ static int xmitframe_addmic(struct _adapter *padapter, 0x0, 0x0}; pframe = pxmitframe->buf_addr + TXDESC_OFFSET; if (bmcst) { - if (!memcmp(psecuritypriv->XGrptxmickey - [psecuritypriv->XGrpKeyid].skey, + if (!memcmp(psecpriv->XGrptxmickey + [psecpriv->XGrpKeyid].skey, null_key, 16)) return -ENOMEM; /*start to calculate the mic code*/ r8712_secmicsetkey(&micdata, - psecuritypriv-> - XGrptxmickey[psecuritypriv-> - XGrpKeyid].skey); + psecpriv->XGrptxmickey + [psecpriv->XGrpKeyid].skey); } else { if (!memcmp(&stainfo->tkiptxmickey.skey[0], null_key, 16)) @@ -417,7 +416,7 @@ static int xmitframe_addmic(struct _adapter *padapter, length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - - ((psecuritypriv->sw_encrypt) + ((psecpriv->sw_encrypt) ? pattrib->icv_len : 0); r8712_secmicappend(&micdata, payload, length); @@ -425,7 +424,7 @@ static int xmitframe_addmic(struct _adapter *padapter, } else { length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - - ((psecuritypriv->sw_encrypt) ? + ((psecpriv->sw_encrypt) ? pattrib->icv_len : 0); r8712_secmicappend(&micdata, payload, length); -- 2.20.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel