]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6655: fix braces at newline in if statements
authorGuillaume Clement <gclement@baobob.org>
Thu, 24 Jul 2014 23:06:26 +0000 (01:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Jul 2014 18:21:28 +0000 (11:21 -0700)
Braces should not be in a separate line for multi-line if
statements. This fixes warnings reported by checkpatch.

Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/wcmd.c
drivers/staging/vt6655/wpa.c

index 0c38fcf2a2a2168d09f55cd6ec428eddf9c980b2..f12eef064c45cae3c674ef28b1413550e7a6fbc5 100644 (file)
@@ -432,9 +432,10 @@ vCommandTimer(
                vAdHocBeaconRestart(pDevice);
 //2008-0409-07, <Add> by Einsn Liu
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-               if (pMgmt->eScanType == WMAC_SCAN_PASSIVE)
-               {//send scan event to wpa_Supplicant
+               if (pMgmt->eScanType == WMAC_SCAN_PASSIVE) {
+                       //send scan event to wpa_Supplicant
                        union iwreq_data wrqu;
+
                        memset(&wrqu, 0, sizeof(wrqu));
                        wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
                }
index 2bd9e1fc06082329f376b8b4e01df4a57f55f156..7b1bab91a9cfbc285ccfd867eee0a92e863da46b 100644 (file)
@@ -123,8 +123,8 @@ WPA_ParseRSN(
            && (pRSN->wVersion == 1)) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Legal RSN\n");
                // update each variable if pRSN is long enough to contain the variable
-               if (pRSN->len >= 10) //oui1(4)+ver(2)+GKSuite(4)
-               {
+               if (pRSN->len >= 10) {
+                       //OUI1(4)+ver(2)+GKSuite(4)
                        if (!memcmp(pRSN->abyMulticast, abyOUI01, 4))
                                pBSSList->byGKType = WPA_WEP40;
                        else if (!memcmp(pRSN->abyMulticast, abyOUI02, 4))
@@ -142,8 +142,8 @@ WPA_ParseRSN(
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "byGKType: %x\n", pBSSList->byGKType);
                }
 
-               if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
-               {
+               if (pRSN->len >= 12) {
+                       //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
                        j = 0;
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wPKCount: %d, sizeof(pBSSList->abyPKType): %zu\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
                        for (i = 0; (i < pRSN->wPKCount) && (j < ARRAY_SIZE(pBSSList->abyPKType)); i++) {