summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorQuytelda Kahja <quytelda@tamalin.org>2018-03-27 01:41:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-29 11:59:28 +0200
commit86c0205ba20c4766dd28a7f5c34afdebccda22e2 (patch)
tree0108133276ced38c1eae45b5854bd6742c2028a2 /drivers/staging
parent41ed8df9bd50489f8d9157645e979775ecb65102 (diff)
staging: rtl8723bs: Remove braces from single statement conditionals.
Several conditionals in rtw_wx_set_auth() contain a comment then a single statement. Move the comments to the top of the conditionals so that braces can be removed from the statements, which saves space and makes the code more readable. Signed-off-by: Quytelda Kahja <quytelda@tamalin.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8723bs/os_dep/ioctl_linux.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 3e78fc28a8eb..1cacd7fff052 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -2151,13 +2151,11 @@ static int rtw_wx_set_auth(struct net_device *dev,
*/
break;
case IW_AUTH_TKIP_COUNTERMEASURES:
- if (param->value) {
- /* wpa_supplicant is enabling the tkip countermeasure. */
+ /* wpa_supplicant is setting the tkip countermeasure. */
+ if (param->value) /* enabling */
padapter->securitypriv.btkip_countermeasure = true;
- } else {
- /* wpa_supplicant is disabling the tkip countermeasure. */
+ else /* disabling */
padapter->securitypriv.btkip_countermeasure = false;
- }
break;
case IW_AUTH_DROP_UNENCRYPTED:
/* HACK:
@@ -2172,10 +2170,12 @@ static int rtw_wx_set_auth(struct net_device *dev,
* be set.
*/
- if (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption1Enabled) {
- break;/* it means init value, or using wep, ndisencryptstatus = Ndis802_11Encryption1Enabled, */
- /* then it needn't reset it; */
- }
+ /*
+ * This means init value, or using wep, ndisencryptstatus =
+ * Ndis802_11Encryption1Enabled, then it needn't reset it;
+ */
+ if (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption1Enabled)
+ break;
if (param->value) {
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;