]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rtl8723bs: Remove braces from single statement conditionals.
authorQuytelda Kahja <quytelda@tamalin.org>
Tue, 27 Mar 2018 08:41:00 +0000 (01:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Mar 2018 09:59:28 +0000 (11:59 +0200)
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>
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

index 3e78fc28a8ebe17e7e0f85fd2d365091c5c4065b..1cacd7fff052deb7a820a8afdbfd2ec46f3f04f7 100644 (file)
@@ -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;