Search Linux Wireless

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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.

Signed-off-by: M. Vefa Bicakci <m.v.b@xxxxxxxxxx>
---
  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]) {

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]) {

+
+		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]));

Same problem here.

Larry

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux