From: "M. Vefa Bicakci" <m.v.b@runbox.com>
To: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Cc: joe@perches.com, Larry.Finger@lwfinger.net,
gregkh@linuxfoundation.org, Jes.Sorensen@redhat.com,
m.v.b@runbox.com
Subject: [PATCH v2 03/16] staging: rtl8723au: else should follow close brace
Date: Sat, 14 Mar 2015 20:10:28 -0400 [thread overview]
Message-ID: <1426378241-32469-4-git-send-email-m.v.b@runbox.com> (raw)
In-Reply-To: <1426378241-32469-1-git-send-email-m.v.b@runbox.com>
Correct checkpatch.pl errors in rtl8723au's rtw_security.c indicating
that an else statement should follow the closing brace of the previous
if/else if code block:
ERROR: else should follow close brace '}'
Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
---
drivers/staging/rtl8723au/core/rtw_security.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index 0306c3896a..d04a1cf6d7 100644
--- a/drivers/staging/rtl8723au/core/rtw_security.c
+++ b/drivers/staging/rtl8723au/core/rtw_security.c
@@ -379,8 +379,7 @@ void rtw_seccalctkipmic23a(u8 *key, u8 *header, u8 *data, u32 data_len,
rtw_secmicappend23a(&micdata, &header[24], 6);
else
rtw_secmicappend23a(&micdata, &header[10], 6);
- }
- else{ /* ToDS == 0 */
+ } else { /* ToDS == 0 */
rtw_secmicappend23a(&micdata, &header[4], 6); /* DA */
if (header[1]&2) /* From Ds == 1 */
rtw_secmicappend23a(&micdata, &header[16], 6);
@@ -673,8 +672,7 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
arcfour_encrypt(&mycontext, payload, payload, length);
arcfour_encrypt(&mycontext, payload+length, crc, 4);
- }
- else {
+ } else {
length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
*((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));/* modified by Amy*/
arcfour_init(&mycontext, rc4key, 16);
@@ -686,8 +684,7 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
}
}
- }
- else {
+ } else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt23a: stainfo == NULL!!!\n"));
DBG_8723A("%s, psta == NUL\n", __func__);
res = _FAIL;
--
2.1.4
next prev parent reply other threads:[~2015-03-15 0:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-15 0:10 [PATCH v2 00/16] checkpatch clean-up of rtl8723au's rtw_security.c M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 01/16] staging: rtl8723au: Reformat whitespace to increase readability M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 02/16] staging: rtl8723au: Fix "before/around/after" whitespace issues M. Vefa Bicakci
2015-03-15 0:10 ` M. Vefa Bicakci [this message]
2015-03-15 0:10 ` [PATCH v2 04/16] staging: rtl8723au: Fix the indentation of two lines M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 05/16] staging: rtl8723au: Reorganize a few functions to remove indentation M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 06/16] staging: rtl8723au: Do not initialize a static to 0 M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 07/16] staging: rtl8723au: else is not generally useful after a return M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 08/16] staging: rtl8723au: Remove unneeded curly braces M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 09/16] staging: rtl8723au: trailing statements should be on next line M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 10/16] staging: rtl8723au: that open brace should be on the previous line M. Vefa Bicakci
2015-03-16 16:36 ` Jes Sorensen
2015-03-15 0:10 ` [PATCH v2 11/16] staging: rtl8723au: No spaces at the start of a line M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 12/16] staging: rtl8723au: Adjust whitespace in and around comments M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 13/16] staging: rtl8723au: suspect code indent for conditional statements M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 14/16] staging: rtl8723au: Rework two byte array comparisons M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 15/16] staging: rtl8723au: Correct a typo in a trace log line M. Vefa Bicakci
2015-03-16 16:38 ` Jes Sorensen
2015-03-15 0:10 ` [PATCH v2 16/16] staging: rtl8723au: Remove unneeded comments M. Vefa Bicakci
2015-03-15 9:31 ` [PATCH v2 00/16] checkpatch clean-up of rtl8723au's rtw_security.c Matthias Beyer
2015-03-15 13:51 ` M. Vefa Bicakci
2015-03-16 16:01 ` Jes Sorensen
2015-03-16 16:55 ` Joe Perches
2015-03-16 17:07 ` Greg KH
2015-03-16 17:11 ` Joe Perches
2015-03-19 4:34 ` 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=1426378241-32469-4-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 \
/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;
as well as URLs for NNTP newsgroup(s).