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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 275C9C433E0 for ; Wed, 17 Mar 2021 03:48:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0D5664DDF for ; Wed, 17 Mar 2021 03:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229578AbhCQDsL (ORCPT ); Tue, 16 Mar 2021 23:48:11 -0400 Received: from smtprelay0191.hostedemail.com ([216.40.44.191]:39974 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229537AbhCQDr5 (ORCPT ); Tue, 16 Mar 2021 23:47:57 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id A50FF100E7B40; Wed, 17 Mar 2021 03:47:56 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: brick97_120943c2773b X-Filterd-Recvd-Size: 2918 Received: from [192.168.1.159] (unknown [47.151.137.21]) (Authenticated sender: joe@perches.com) by omf02.hostedemail.com (Postfix) with ESMTPA; Wed, 17 Mar 2021 03:47:55 +0000 (UTC) Message-ID: Subject: Re: [PATCH] staging: rtl8723bs/core: add spaces between operators From: Joe Perches To: Qiang Ma , gregkh@linuxfoundation.org, ross.schm.dev@gmail.com, mhocko@suse.com, john.oldman@polehill.co.uk, longman@redhat.com, matthew.v.deangelis@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Date: Tue, 16 Mar 2021 20:47:53 -0700 In-Reply-To: <20210316120500.351-1-maqianga@uniontech.com> References: <20210316120500.351-1-maqianga@uniontech.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2021-03-16 at 20:05 +0800, Qiang Ma wrote: > Add spaces between operators for a better readability > in function 'rtw_seccalctkipmic'. Perhaps better would be to refactor it a bit to follow the comments. Something like: --- drivers/staging/rtl8723bs/core/rtw_security.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index a311595deafb..a30e1fa717af 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -405,30 +405,26 @@ void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst) void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_code, u8 pri) { - struct mic_data micdata; u8 priority[4] = {0x0, 0x0, 0x0, 0x0}; + int da_offset; + int sa_offset; rtw_secmicsetkey(&micdata, key); priority[0] = pri; /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */ - if (header[1]&1) { /* ToDS == 1 */ - rtw_secmicappend(&micdata, &header[16], 6); /* DA */ - if (header[1]&2) /* From Ds == 1 */ - rtw_secmicappend(&micdata, &header[24], 6); - else - rtw_secmicappend(&micdata, &header[10], 6); - } else { /* ToDS == 0 */ - rtw_secmicappend(&micdata, &header[4], 6); /* DA */ - if (header[1]&2) /* From Ds == 1 */ - rtw_secmicappend(&micdata, &header[16], 6); - else - rtw_secmicappend(&micdata, &header[10], 6); + if (header[1] & 1) { /* ToDS == 1 */ + da_offset = 16; + sa_offset = (header[1] & 2) ? 24 : 10; + } else { /* ToDS == 0 */ + da_offset = 4; + sa_offset = (header[1] & 2) ? 16 : 10; } + rtw_secmicappend(&micdata, &header[da_offset], 6); /* DA */ + rtw_secmicappend(&micdata, &header[sa_offset], 6); /* SA */ rtw_secmicappend(&micdata, &priority[0], 4); - rtw_secmicappend(&micdata, data, data_len); rtw_secgetmic(&micdata, mic_code);