staging: rtl8712: fix some confusing indenting
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 5 Mar 2014 11:26:50 +0000 (14:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Mar 2014 19:58:32 +0000 (11:58 -0800)
These set off a static checker warning about "warn: add curly braces?",
but actually the code it correct, it's just the indenting which is
wrong.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/ieee80211.c
drivers/staging/rtl8712/rtl871x_security.c

index cc68d9748edb382fd16615a5cf7300651c14d0ab..57fef70ad984d9949d34a0b5793542459a862999 100644 (file)
@@ -78,9 +78,9 @@ uint r8712_is_cckrates_included(u8 *rate)
                if ((((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
                    (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22))
                        return true;
-                       i++;
-               }
-               return false;
+               i++;
+       }
+       return false;
 }
 
 uint r8712_is_cckratesonly_included(u8 *rate)
index aae5125a2e7edf3499dd1591b8783d6d247efce4..5ffc489e950150ba447fd92ba03015a6d223ed20 100644 (file)
@@ -1244,17 +1244,18 @@ static sint aes_decipher(u8 *key, uint  hdrlen,
            (frtype == WIFI_DATA_CFPOLL) ||
            (frtype == WIFI_DATA_CFACKPOLL)) {
                qc_exists = 1;
-               if (hdrlen !=  WLAN_HDR_A3_QOS_LEN)
+               if (hdrlen != WLAN_HDR_A3_QOS_LEN)
                        hdrlen += 2;
-               }  else if ((frsubtype == 0x08) ||
+       } else if ((frsubtype == 0x08) ||
                   (frsubtype == 0x09) ||
                   (frsubtype == 0x0a) ||
                   (frsubtype == 0x0b)) {
-                       if (hdrlen !=  WLAN_HDR_A3_QOS_LEN)
-                               hdrlen += 2;
-                       qc_exists = 1;
-       } else
+               if (hdrlen != WLAN_HDR_A3_QOS_LEN)
+                       hdrlen += 2;
+               qc_exists = 1;
+       } else {
                qc_exists = 0;
+       }
        /* now, decrypt pframe with hdrlen offset and plen long */
        payload_index = hdrlen + 8; /* 8 is for extiv */
        for (i = 0; i < num_blocks; i++) {