Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1601203
| From | sunil.m@techveda.org |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces |
| Date | 2017-03-15 11:00 +0100 |
| Message-ID | <tldSO-5Pm-23@gated-at.bofh.it> (permalink) |
| References | <tkc2K-2cL-21@gated-at.bofh.it> <tldSN-5Pm-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Suniel Mahesh <sunil.m@techveda.org>
Fixed unbalanced braces around else statement
Add braces on all arms of the if-else statements to comply with
kernel coding style.
Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
---
Changes for v3:
- Split earlier patches into multiple commits for easy review
as suggested by Greg K-H
- Modified subject and description for better readability
- Rebased on top of next-20170310
- Patches were tested and built on next-20170310 and staging-testing
as suggested by Greg K-H, no errors reported
Changes for v2:
- new patch addition to the series
- Rebased on top of next-20170306
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 30 +++++++++++++++++-----------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 0fa4017..c355ee7 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2294,17 +2294,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;
}
@@ -2346,20 +2349,23 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} else {
memcpy((u8 *)key, ipw->u.crypt.key, 16);
- if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+ if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
ieee->group_key_type = KEY_TYPE_CCMP;
- else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+ } else if (strcmp(ipw->u.crypt.alg,
+ "TKIP") == 0) {
ieee->group_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->group_key_type =
KEY_TYPE_WEP104;
- else if (ipw->u.crypt.key_len == 5)
+ } 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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/8] staging: rtl8192e: Fix coding style, warnings and checks sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 8/8] staging: rtl8192e: Fix blank lines and space after a cast sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 2/8] staging: rtl8192e: Fix coding style sunil.m@techveda.org - 2017-03-15 11:00 +0100
Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Suniel Mahesh <sunil.m@techveda.org> - 2017-03-15 12:20 +0100
Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 12:20 +0100
[PATCH v3 6/8] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces sunil.m@techveda.org - 2017-03-15 11:00 +0100
Re: [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:30 +0100
[PATCH v3 1/8] staging: rtl8192e: Fix comments as per kernel coding style sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 7/8] staging: rtl8192e: Fix issues reported by checkpatch.pl sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 4/8] staging: rtl8192e: Rectify pointer comparisions with NULL sunil.m@techveda.org - 2017-03-15 11:00 +0100
[PATCH v3 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message sunil.m@techveda.org - 2017-03-15 11:00 +0100
Re: [PATCH v3 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
[PATCH v4 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message sunil.m@techveda.org - 2017-03-15 12:00 +0100
Re: [PATCH v4 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message Greg KH <gregkh@linuxfoundation.org> - 2017-03-16 03:40 +0100
[PATCH v4 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m@techveda.org - 2017-03-16 23:30 +0100
[PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and checks sunil.m@techveda.org - 2017-03-16 23:30 +0100
[PATCH v4 6/6] staging: rtl8192e: Fix blank lines and space after a cast sunil.m@techveda.org - 2017-03-16 23:30 +0100
Re: [PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and checks Greg KH <gregkh@linuxfoundation.org> - 2017-03-17 07:20 +0100
[PATCH v5 2/6] staging: rtl8192e: Remove unnecessary 'out of memory' message suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 0/6] staging: rtl8192e: Fix coding style, warnings and checks suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 6/6] staging: rtl8192e: Fix blank lines and space after a cast suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 3/6] staging: rtl8192e: Rectify pointer comparisions with NULL suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 1/6] staging: rtl8192e: Fix comments as per kernel coding style suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
[PATCH v5 5/6] staging: rtl8192e: Fix issues reported by checkpatch.pl suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
csiph-web