Staging: vt6656: removed VOID/PVOID definitions

[linux-2.6-block.git] / drivers / staging / vt6656 / wpa2.c

diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index fa3aeedfb278606bc65dd9ef662f81a6e31dc532..73bfb500d45b6ebd44fb433323ccfb7a6bd6b881 100644 (file)
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -71,9 +71,9 @@ const BYTE abyOUIPSK[4]     = { 0x00, 0x0F, 0xAC, 0x02 };
  * Return Value: none.
  *
 -*/
-VOID
+void
 WPA2_ClearRSN (
-    IN PKnownBSS        pBSSNode
+     PKnownBSS        pBSSNode
     )
 {
     int ii;
@@ -106,10 +106,10 @@ WPA2_ClearRSN (
  * Return Value: none.
  *
 -*/
-VOID
+void
 WPA2vParseRSN (
-    IN PKnownBSS        pBSSNode,
-    IN PWLAN_IE_RSN     pRSN
+     PKnownBSS        pBSSNode,
+     PWLAN_IE_RSN     pRSN
     )
 {
     int                 i, j;
@@ -261,8 +261,7 @@ WPA2vParseRSN (
  *
 -*/
 UINT
-WPA2uSetIEs(
-    IN PVOID pMgmtHandle,
+WPA2uSetIEs(void *pMgmtHandle,
     OUT PWLAN_IE_RSN pRSNIEs
     )
 {
@@ -337,20 +336,25 @@ WPA2uSetIEs(
         }
         pRSNIEs->len +=2;
 
-        if ((pMgmt->gsPMKIDCache.BSSIDInfoCount > 0) &&
-            (pMgmt->bRoaming == TRUE) &&
+       if ((pMgmt->gsPMKIDCache.BSSIDInfoCount > 0) &&
+           (pMgmt->bRoaming == TRUE) &&
             (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
-            // RSN PMKID
-            pwPMKID = (PWORD)(&pRSNIEs->abyRSN[18]);  // Point to PMKID count
-            *pwPMKID = 0;                               // Initialize PMKID count
-            pbyBuffer = &pRSNIEs->abyRSN[20];           // Point to PMKID list
-            for (ii = 0; ii < pMgmt->gsPMKIDCache.BSSIDInfoCount; ii++) {
-                if ( !memcmp(&pMgmt->gsPMKIDCache.BSSIDInfo[ii].abyBSSID[0], pMgmt->abyCurrBSSID, U_ETHER_ADDR_LEN)) {
-                    (*pwPMKID) ++;
-                    memcpy(pbyBuffer, pMgmt->gsPMKIDCache.BSSIDInfo[ii].abyPMKID, 16);
-                    pbyBuffer += 16;
-                }
-            }
+               /* RSN PMKID, pointer to PMKID count */
+               pwPMKID = (PWORD)(&pRSNIEs->abyRSN[18]);
+               *pwPMKID = 0;                     /* Initialize PMKID count */
+               pbyBuffer = &pRSNIEs->abyRSN[20];    /* Point to PMKID list */
+               for (ii = 0; ii < pMgmt->gsPMKIDCache.BSSIDInfoCount; ii++) {
+                       if (!memcmp(&pMgmt->
+                                   gsPMKIDCache.BSSIDInfo[ii].abyBSSID[0],
+                                   pMgmt->abyCurrBSSID,
+                                   ETH_ALEN)) {
+                               (*pwPMKID)++;
+                               memcpy(pbyBuffer,
+                       pMgmt->gsPMKIDCache.BSSIDInfo[ii].abyPMKID,
+                                      16);
+                               pbyBuffer += 16;
+                       }
+               }
             if (*pwPMKID != 0) {
                 pRSNIEs->len += (2 + (*pwPMKID)*16);
             } else {