mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "M. Vefa Bicakci" <m.v.b@runbox.com>
To: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Cc: m.v.b@runbox.com
Subject: [PATCH 14/16] staging: rtl8723au: Improve readability of two very long lines
Date: Thu, 12 Mar 2015 23:15:30 -0400	[thread overview]
Message-ID: <1426216532-24058-15-git-send-email-m.v.b@runbox.com> (raw)
In-Reply-To: <1426216532-24058-1-git-send-email-m.v.b@runbox.com>

Improve the readability of an if statement and its very long trace
output line in rtl8723au's rtw_security.c.

Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
---
 drivers/staging/rtl8723au/core/rtw_security.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index dbbe7b348d..fd04ae78bb 100644
--- 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]) {
+
+		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]));
 		res = _FAIL;
 	}
 
-- 
2.1.4


  parent reply	other threads:[~2015-03-13  3:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-13  3:15 [PATCH 00/16] checkpatch clean-up of rtl8723au's rtw_security.c M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 01/16] staging: rtl8723au: Reformat whitespace to increase readability M. Vefa Bicakci
2015-03-13  4:53   ` Sudip Mukherjee
2015-03-13 11:16     ` M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 02/16] staging: rtl8723au: Fix "before/around/after" whitespace issues M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 03/16] staging: rtl8723au: else should follow close brace M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 04/16] staging: rtl8723au: Fix the indentation of two lines M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 05/16] staging: rtl8723au: Reorganize a few functions to remove indentation M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 06/16] staging: rtl8723au: Do not initialize a static to 0 M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 07/16] staging: rtl8723au: else is not generally useful after a return M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 08/16] staging: rtl8723au: Remove unneeded curly braces M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 09/16] staging: rtl8723au: trailing statements should be on next line M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 10/16] staging: rtl8723au: that open brace should be on the previous line M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 11/16] staging: rtl8723au: No spaces at the start of a line M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 12/16] staging: rtl8723au: Adjust whitespace in and around comments M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 13/16] staging: rtl8723au: suspect code indent for conditional statements M. Vefa Bicakci
2015-03-13  3:15 ` M. Vefa Bicakci [this message]
2015-03-13 15:44   ` [PATCH 14/16] staging: rtl8723au: Improve readability of two very long lines Larry Finger
2015-03-13 16:24     ` Joe Perches
2015-03-14 20:16       ` M. Vefa Bicakci
2015-03-14 21:55         ` Joe Perches
2015-03-15  0:17           ` M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 15/16] staging: rtl8723au: Correct a typo in a trace log line M. Vefa Bicakci
2015-03-13  3:15 ` [PATCH 16/16] staging: rtl8723au: Remove unneeded comments M. Vefa Bicakci

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426216532-24058-15-git-send-email-m.v.b@runbox.com \
    --to=m.v.b@runbox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®