From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752306AbbCNVzM (ORCPT ); Sat, 14 Mar 2015 17:55:12 -0400 Received: from smtprelay0188.hostedemail.com ([216.40.44.188]:47999 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751506AbbCNVzJ (ORCPT ); Sat, 14 Mar 2015 17:55:09 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:599:973:988:989:1260:1261:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:2911:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3870:3872:4321:4425:5007:6119:7652:7903:9036:10004:10400:10848:11026:11232:11657:11658:11914:12043:12296:12438:12517:12519:12663:12740:13255:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: book28_fa53d6315934 X-Filterd-Recvd-Size: 3203 Message-ID: <1426370106.6696.16.camel@perches.com> Subject: Re: [PATCH 14/16] staging: rtl8723au: Improve readability of two very long lines From: Joe Perches To: "M. Vefa Bicakci" Cc: Larry Finger , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Date: Sat, 14 Mar 2015 14:55:06 -0700 In-Reply-To: <55049722.9090702@runbox.com> References: <1426216532-24058-1-git-send-email-m.v.b@runbox.com> <1426216532-24058-15-git-send-email-m.v.b@runbox.com> <550305D5.9080209@lwfinger.net> <1426263881.11459.17.camel@perches.com> <55049722.9090702@runbox.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 2015-03-14 at 16:16 -0400, M. Vefa Bicakci wrote: > On 13/03/15 12:24 PM, Joe Perches wrote: > > On Fri, 2015-03-13 at 10:44 -0500, Larry Finger wrote: > >> On 03/12/2015 10:15 PM, M. Vefa Bicakci wrote: > >>> Improve the readability of an if statement and its very long trace > >>> output line in rtl8723au's rtw_security.c. > > [] > >>> diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c > > [] > >>> @@ -759,9 +759,21 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter, > >>> > >>> *((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4)); > >>> > >>> - if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) { > >>> - RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_wep_decrypt23a:icv error crc[3](%x)!= payload[length-1](%x) || crc[2](%x)!= payload[length-2](%x) || crc[1](%x)!= payload[length-3](%x) || crc[0](%x)!= payload[length-4](%x)\n", > >>> - crc[3], payload[length - 1], crc[2], payload[length - 2], crc[1], payload[length - 3], crc[0], payload[length - 4])); > >>> + if (crc[3] != payload[length - 1] || > >>> + crc[2] != payload[length - 2] || > >>> + crc[1] != payload[length - 3] || > >>> + crc[0] != payload[length - 4]) { > >> > >> The continuation lines should be lined up with the opening paren. This should be > >> > >> if (crc[3] != payload[length - 1] || > >> crc[2] != payload[length - 2] || > >> crc[1] != payload[length - 3] || > >> crc[0] != payload[length - 4]) { > > > > Maybe: > > if (memcmp(&crc, &payload[length - 4], 4)) { > > RT_TRACE(etc, "%08x vs %4phN", > > crc, &payload[length - 4]) [] > I have addressed your comments in my local repository, and I hope to send out > the second version of the commits for review by tomorrow. Maybe it'd be more sensible to use something like: u32 crc, orig_crc; [...] crc = le32_to_cpu(getcrc32(payload, length - 4)); orig_crc = le32_to_cpu(get_unaligned_le32(&payload[length - 4])); if (crc != orig_crc) { RT_TRACE(etc, "bad crc: %08x vs %08x", crc, orig_crc);