Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[karo-tx-linux.git] / drivers / staging / vt6655 / wpa2.c

diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index 0b33feabcd16ea10d698215e64f220159e5b8068..089788dfba633001b0682b99f6f27d68e266b2f6 100644 (file)
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -51,7 +51,6 @@ const unsigned char abyOUICCMP[4]    = { 0x00, 0x0F, 0xAC, 0x04 };
 const unsigned char abyOUI8021X[4]   = { 0x00, 0x0F, 0xAC, 0x01 };
 const unsigned char abyOUIPSK[4]     = { 0x00, 0x0F, 0xAC, 0x02 };
 
-
 /*---------------------  Static Functions  --------------------------*/
 
 /*---------------------  Export Variables  --------------------------*/
@@ -137,7 +136,6 @@ WPA2vParseRSN(
        // information element header makes sense
        if ((pRSN->byElementID == WLAN_EID_RSN) &&
            (pRSN->wVersion == 1)) {
-
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Legal 802.11i RSN\n");
 
                pbyOUI = &(pRSN->abyRSN[0]);
@@ -169,7 +167,6 @@ WPA2vParseRSN(
                        pbyOUI = &(pRSN->abyRSN[6]);
 
                        for (i = 0; (i < pBSSNode->wCSSPKCount) && (j < sizeof(pBSSNode->abyCSSPK)/sizeof(unsigned char)); i++) {
-
                                if (pRSN->len >= 8+i*4+4) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*i)
                                        if (!memcmp(pbyOUI, abyOUIGK, 4)) {
                                                pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_USE_GROUP;
@@ -246,7 +243,6 @@ WPA2vParseRSN(
        }
 }
 
-
 /*+
  *
  * Description:
@@ -273,7 +269,7 @@ WPA2uSetIEs(
        unsigned short *pwPMKID = NULL;
 
        if (pRSNIEs == NULL) {
-               return(0);
+               return 0;
        }
        if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
             (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
@@ -358,7 +354,7 @@ WPA2uSetIEs(
                                pbyBuffer = &pRSNIEs->abyRSN[18];
                        }
                }
-               return(pRSNIEs->len + WLAN_IEHDR_LEN);
+               return pRSNIEs->len + WLAN_IEHDR_LEN;
        }
-       return(0);
+       return 0;
 }