Thread (24 messages) flat view 24 messages, 4 authors, 2015-03-15

Re: [PATCH 14/16] staging: rtl8723au: Improve readability of two very long lines

From: M. Vefa Bicakci <hidden>
Date: 2015-03-14 20:16:49
Also in: lkml

On 13/03/15 12:24 PM, Joe Perches wrote:
On Fri, 2015-03-13 at 10:44 -0500, Larry Finger wrote:
quoted
On 03/12/2015 10:15 PM, M. Vefa Bicakci wrote:
quoted
Improve the readability of an if statement and its very long trace
output line in rtl8723au's rtw_security.c.
[]
quoted
quoted
diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
[]
quoted
quoted
@@ -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])
Hello Larry and Joe,

Thank you for the reviews!

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.

Vefa
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help