From: "M. Vefa Bicakci" <m.v.b@runbox.com>
To: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Cc: gregkh@linuxfoundation.org, Jes.Sorensen@redhat.com,
joe@perches.com, Larry.Finger@lwfinger.net,
mail@beyermatthias.de, m.v.b@runbox.com
Subject: [PATCH v4 12/15] staging: rtl8723au: suspect code indent for conditional statements
Date: Sat, 28 Mar 2015 08:52:45 -0400 [thread overview]
Message-ID: <1427547168-12078-13-git-send-email-m.v.b@runbox.com> (raw)
In-Reply-To: <1427547168-12078-1-git-send-email-m.v.b@runbox.com>
Correct a number of indentation-with-spaces-and-tabs issues in
rtl8723au's rtw_security.c, according to checkpatch.pl:
WARNING: suspect code indent for conditional statements
Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
---
v3: Make sure that all edited lines are at most 80 characters wide.
---
drivers/staging/rtl8723au/core/rtw_security.c | 46 ++++++++++++++++-----------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index 8591b49664..4330479ee0 100644
--- a/drivers/staging/rtl8723au/core/rtw_security.c
+++ b/drivers/staging/rtl8723au/core/rtw_security.c
@@ -761,8 +761,16 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
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]));
+ 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;
}
@@ -909,9 +917,9 @@ static void mix_column(u8 *in, u8 *out)
for (i = 0; i < 4; i++) {
if ((in[i] & 0x80) == 0x80)
- add1b[i] = 0x1b;
+ add1b[i] = 0x1b;
else
- add1b[i] = 0x00;
+ add1b[i] = 0x00;
}
swap_halfs[0] = in[2]; /* Swap halfs */
@@ -966,21 +974,21 @@ static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext)
for (round = 0; round < 11; round++) {
if (round == 0) {
- xor_128(round_key, data, ciphertext);
- next_key(round_key, round);
+ xor_128(round_key, data, ciphertext);
+ next_key(round_key, round);
} else if (round == 10) {
- byte_sub(ciphertext, intermediatea);
- shift_row(intermediatea, intermediateb);
- xor_128(intermediateb, round_key, ciphertext);
+ byte_sub(ciphertext, intermediatea);
+ shift_row(intermediatea, intermediateb);
+ xor_128(intermediateb, round_key, ciphertext);
} else { /* 1 - 9 */
- byte_sub(ciphertext, intermediatea);
- shift_row(intermediatea, intermediateb);
- mix_column(&intermediateb[0], &intermediatea[0]);
- mix_column(&intermediateb[4], &intermediatea[4]);
- mix_column(&intermediateb[8], &intermediatea[8]);
- mix_column(&intermediateb[12], &intermediatea[12]);
- xor_128(intermediatea, round_key, ciphertext);
- next_key(round_key, round);
+ byte_sub(ciphertext, intermediatea);
+ shift_row(intermediatea, intermediateb);
+ mix_column(&intermediateb[0], &intermediatea[0]);
+ mix_column(&intermediateb[4], &intermediatea[4]);
+ mix_column(&intermediateb[8], &intermediatea[8]);
+ mix_column(&intermediateb[12], &intermediatea[12]);
+ xor_128(intermediatea, round_key, ciphertext);
+ next_key(round_key, round);
}
}
@@ -1481,7 +1489,7 @@ static int aes_decipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
for (j = 0; j < 16; j++)
padded_buffer[j] = 0x00;
for (j = 0; j < payload_remainder; j++)
- padded_buffer[j] = message[payload_index++];
+ padded_buffer[j] = message[payload_index++];
bitwise_xor(aes_out, padded_buffer, chain_buffer);
aes128k128d(key, chain_buffer, aes_out);
}
@@ -1511,7 +1519,7 @@ static int aes_decipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
message, pn_vector, num_blocks+1);
for (j = 0; j < 16; j++)
- padded_buffer[j] = 0x00;
+ padded_buffer[j] = 0x00;
for (j = 0; j < payload_remainder; j++)
padded_buffer[j] = message[payload_index + j];
aes128k128d(key, ctr_preload, aes_out);
--
2.1.4
next prev parent reply other threads:[~2015-03-28 12:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-28 12:52 [PATCH v4 00/15] checkpatch clean-up of rtl8723au's rtw_security.c M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 01/15] staging: rtl8723au: Reformat whitespace to increase readability M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 02/15] staging: rtl8723au: Fix "before/around/after" whitespace issues M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 03/15] staging: rtl8723au: else should follow close brace M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 04/15] staging: rtl8723au: Fix the indentation of two lines M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 05/15] staging: rtl8723au: Reorganize a few functions to remove indentation M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 06/15] staging: rtl8723au: else is not generally useful after a return M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 07/15] staging: rtl8723au: Remove unneeded curly braces M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 08/15] staging: rtl8723au: trailing statements should be on next line M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 09/15] staging: rtl8723au: that open brace should be on the previous line M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 10/15] staging: rtl8723au: No spaces at the start of a line M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 11/15] staging: rtl8723au: Adjust whitespace in and around comments M. Vefa Bicakci
2015-03-28 12:52 ` M. Vefa Bicakci [this message]
2015-03-28 12:52 ` [PATCH v4 13/15] staging: rtl8723au: Rework two byte array comparisons M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 14/15] staging: rtl8723au: Use __func__ in trace logs M. Vefa Bicakci
2015-03-28 12:52 ` [PATCH v4 15/15] staging: rtl8723au: Remove unneeded comments M. Vefa Bicakci
2015-03-28 19:52 ` [PATCH v4 00/15] checkpatch clean-up of rtl8723au's rtw_security.c Joe Perches
2015-03-28 23:58 ` 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=1427547168-12078-13-git-send-email-m.v.b@runbox.com \
--to=m.v.b@runbox.com \
--cc=Jes.Sorensen@redhat.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mail@beyermatthias.de \
/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