From: sunil.m@techveda.org
To: gregkh@linuxfoundation.org, dan.carpenter@oracle.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
suniel.spartan@gmail.com, Suniel Mahesh <sunil.m@techveda.org>
Subject: [PATCH v2 4/5] staging: rtl8192e: Fix unbalanced braces around else statement
Date: Fri, 10 Mar 2017 00:20:47 +0530 [thread overview]
Message-ID: <1489085448-3243-5-git-send-email-sunil.m@techveda.org> (raw)
In-Reply-To: <1489085448-3243-1-git-send-email-sunil.m@techveda.org>
From: Suniel Mahesh <sunil.m@techveda.org>
Fix unbalanced braces around else statement reported by checkpatch.pl
Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
---
Changes for v2:
- new patch addition to the series
- Rebased on top of next-20170306
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 028755b..fb711d2 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2257,17 +2257,20 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) {
if (ipw->u.crypt.set_tx) {
- if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+ if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
ieee->pairwise_key_type = KEY_TYPE_CCMP;
- else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+ } else if (strcmp(ipw->u.crypt.alg,
+ "TKIP") == 0) {
ieee->pairwise_key_type = KEY_TYPE_TKIP;
- else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
- if (ipw->u.crypt.key_len == 13)
+ } else if (strcmp(ipw->u.crypt.alg,
+ "WEP") == 0) {
+ if (ipw->u.crypt.key_len == 13) {
ieee->pairwise_key_type =
KEY_TYPE_WEP104;
- else if (ipw->u.crypt.key_len == 5)
+ } else if (ipw->u.crypt.key_len == 5) {
ieee->pairwise_key_type =
KEY_TYPE_WEP40;
+ }
} else {
ieee->pairwise_key_type = KEY_TYPE_NA;
}
@@ -2322,9 +2325,9 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
else if (ipw->u.crypt.key_len == 5)
ieee->group_key_type =
KEY_TYPE_WEP40;
- } else
+ } else {
ieee->group_key_type = KEY_TYPE_NA;
-
+ }
if (ieee->group_key_type) {
rtl92e_set_swcam(dev, ipw->u.crypt.idx,
ipw->u.crypt.idx,
--
1.9.1
next prev parent reply other threads:[~2017-03-09 18:52 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-07 7:09 [PATCH] staging: rtl8192e: fix coding style issue, improve error handling Suniel Mahesh
2017-03-07 17:12 ` Dan Carpenter
2017-03-09 18:50 ` [PATCH v2 0/5] staging: rtl8192e: Fix coding style, warnings and checks sunil.m
2017-03-09 18:50 ` [PATCH v2 1/5] staging: rtl8192e: Fix coding style issues sunil.m
2017-03-11 8:11 ` kbuild test robot
2017-03-12 13:41 ` Greg KH
2017-03-15 9:51 ` [PATCH v3 0/8] staging: rtl8192e: Fix coding style, warnings and checks sunil.m
2017-03-15 9:51 ` [PATCH v3 1/8] staging: rtl8192e: Fix comments as per kernel coding style sunil.m
2017-03-15 9:51 ` [PATCH v3 2/8] staging: rtl8192e: Fix " sunil.m
2017-03-15 10:14 ` Dan Carpenter
2017-03-15 11:09 ` Suniel Mahesh
2017-03-15 11:15 ` Dan Carpenter
2017-03-15 10:15 ` Dan Carpenter
2017-03-15 9:51 ` [PATCH v3 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message sunil.m
2017-03-15 10:16 ` Dan Carpenter
2017-03-15 10:58 ` [PATCH v4 " sunil.m
2017-03-16 2:36 ` Greg KH
2017-03-16 22:12 ` [PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and checks sunil.m
2017-03-16 22:12 ` [PATCH v4 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m
2017-03-16 22:12 ` [PATCH v4 6/6] staging: rtl8192e: Fix blank lines and space after a cast sunil.m
2017-03-17 6:16 ` [PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and checks Greg KH
2017-03-21 9:00 ` [PATCH v5 " suniel.spartan
2017-03-21 9:01 ` [PATCH v5 1/6] staging: rtl8192e: Fix comments as per kernel coding style suniel.spartan
2017-03-21 9:01 ` [PATCH v5 2/6] staging: rtl8192e: Remove unnecessary 'out of memory' message suniel.spartan
2017-03-21 9:01 ` [PATCH v5 3/6] staging: rtl8192e: Rectify pointer comparisions with NULL suniel.spartan
2017-03-21 9:01 ` [PATCH v5 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct suniel.spartan
2017-03-21 9:01 ` [PATCH v5 5/6] staging: rtl8192e: Fix issues reported by checkpatch.pl suniel.spartan
2017-03-21 9:01 ` [PATCH v5 6/6] staging: rtl8192e: Fix blank lines and space after a cast suniel.spartan
2017-03-15 9:51 ` [PATCH v3 4/8] staging: rtl8192e: Rectify pointer comparisions with NULL sunil.m
2017-03-15 9:51 ` [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces sunil.m
2017-03-15 10:24 ` Dan Carpenter
2017-03-15 9:51 ` [PATCH v3 6/8] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m
2017-03-15 9:51 ` [PATCH v3 7/8] staging: rtl8192e: Fix issues reported by checkpatch.pl sunil.m
2017-03-15 9:51 ` [PATCH v3 8/8] staging: rtl8192e: Fix blank lines and space after a cast sunil.m
2017-03-09 18:50 ` [PATCH v2 2/5] staging: rtl8192e: Improve error handling sunil.m
2017-03-09 18:50 ` [PATCH v2 3/5] staging: rtl8192e: Rectify pointer comparisions sunil.m
2017-03-09 18:50 ` sunil.m [this message]
2017-03-09 18:50 ` [PATCH v2 5/5] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m
2017-03-17 9:58 ` Suniel Mahesh
2017-03-09 18:50 ` [PATCH] staging: rtl8192e: fix coding style issue, improve error handling kbuild test robot
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=1489085448-3243-5-git-send-email-sunil.m@techveda.org \
--to=sunil.m@techveda.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=suniel.spartan@gmail.com \
/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
Powered by JetHome