---

yaml --- r: 363767 b: refs/heads/master c: 9fbafdd h: refs/heads/master i: 363765: d1eebf7 363763: 0340e05 363759: be306f8 v: v3
git-mirror · Mar 28, 2013 · 1458580 · 1458580
1 parent 8b04f91
commit 1458580
Show file tree

Hide file tree

Showing 69 changed files with 1 addition and 876 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cedfa317eb15a82b4e44ed868f4e451238d5aea
+refs/heads/master: 9fbafdd9add10e349deeb1f38290943d5107e276
diff --git a/trunk/drivers/staging/vt6656/80211hdr.h b/trunk/drivers/staging/vt6656/80211hdr.h
@@ -28,7 +28,6 @@
 #ifndef __80211HDR_H__
 #define __80211HDR_H__
 
-
 /* bit type */
 #define BIT0	0x00000001
 #define BIT1	0x00000002
@@ -322,7 +321,4 @@ typedef union tagUWLAN_80211HDR {
 
 } UWLAN_80211HDR, *PUWLAN_80211HDR;
 
-
-
-
 #endif /* __80211HDR_H__ */
diff --git a/trunk/drivers/staging/vt6656/80211mgr.c b/trunk/drivers/staging/vt6656/80211mgr.c
@@ -56,20 +56,9 @@
 #include "80211hdr.h"
 #include "wpa.h"
 
-
-
-
-
-
 static int          msglevel                = MSG_LEVEL_INFO;
 /*static int          msglevel                =MSG_LEVEL_DEBUG;*/
 
-
-
-
-
-
-
 /*+
  *
  * Routine Description:
@@ -112,7 +101,6 @@ vMgrEncodeBeacon(
  *
 -*/
 
-
 void
 vMgrDecodeBeacon(
       PWLAN_FR_BEACON  pFrame
@@ -237,14 +225,12 @@ vMgrEncodeDisassociation(
 {
     pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
 
-
     /* Fixed Fields */
     pFrame->pwReason = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_DISASSOC_OFF_REASON);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON + sizeof(*(pFrame->pwReason));
 }
 
-
 /*+
  *
  * Routine Description:
@@ -279,7 +265,6 @@ vMgrDecodeDisassociation(
  *
 -*/
 
-
 void
 vMgrEncodeAssocRequest(
       PWLAN_FR_ASSOCREQ  pFrame
@@ -294,7 +279,6 @@ vMgrEncodeAssocRequest(
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT + sizeof(*(pFrame->pwListenInterval));
 }
 
-
 /*+
  *
  * Routine Description: (AP)
@@ -388,7 +372,6 @@ vMgrEncodeAssocResponse(
                   + sizeof(*(pFrame->pwAid));
 }
 
-
 /*+
  *
  * Routine Description:
@@ -431,7 +414,6 @@ vMgrDecodeAssocResponse(
         pFrame->pExtSuppRates = NULL;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -460,7 +442,6 @@ vMgrEncodeReassocRequest(
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCREQ_OFF_CURR_AP + sizeof(*(pFrame->pAddrCurrAP));
 }
 
-
 /*+
  *
  * Routine Description: (AP)
@@ -472,7 +453,6 @@ vMgrEncodeReassocRequest(
  *
 -*/
 
-
 void
 vMgrDecodeReassocRequest(
       PWLAN_FR_REASSOCREQ  pFrame
@@ -528,8 +508,6 @@ vMgrDecodeReassocRequest(
     }
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -541,7 +519,6 @@ vMgrDecodeReassocRequest(
  *
 -*/
 
-
 void
 vMgrEncodeProbeRequest(
      PWLAN_FR_PROBEREQ  pFrame
@@ -601,7 +578,6 @@ vMgrDecodeProbeRequest(
     }
 }
 
-
 /*+
  *
  * Routine Description:
@@ -613,7 +589,6 @@ vMgrDecodeProbeRequest(
  *
 -*/
 
-
 void
 vMgrEncodeProbeResponse(
      PWLAN_FR_PROBERESP  pFrame
@@ -634,8 +609,6 @@ vMgrEncodeProbeResponse(
                   sizeof(*(pFrame->pwCapInfo));
 }
 
-
-
 /*+
  *
  * Routine Description:
@@ -654,7 +627,6 @@ vMgrDecodeProbeResponse(
 {
     PWLAN_IE    pItem;
 
-
     pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
 
 	/* Fixed Fields */
@@ -748,7 +720,6 @@ vMgrDecodeProbeResponse(
     }
 }
 
-
 /*+
  *
  * Routine Description:
@@ -777,7 +748,6 @@ vMgrEncodeAuthen(
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS + sizeof(*(pFrame->pwStatus));
 }
 
-
 /*+
  *
  * Routine Description:
@@ -814,7 +784,6 @@ vMgrDecodeAuthen(
         pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem;
 }
 
-
 /*+
  *
  * Routine Description:
@@ -839,7 +808,6 @@ vMgrEncodeDeauthen(
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON + sizeof(*(pFrame->pwReason));
 }
 
-
 /*+
  *
  * Routine Description:
@@ -863,7 +831,6 @@ vMgrDecodeDeauthen(
                                + WLAN_DEAUTHEN_OFF_REASON);
 }
 
-
 /*+
  *
  * Routine Description: (AP)

diff --git a/trunk/drivers/staging/vt6656/80211mgr.h b/trunk/drivers/staging/vt6656/80211mgr.h
@@ -33,7 +33,6 @@
 
 #include "80211hdr.h"
 
-
 #define WLAN_MIN_ARRAY          1
 
 /* Information Element ID value */
@@ -211,9 +210,6 @@
 #define MEASURE_MODE_INCAPABLE  0x02
 #define MEASURE_MODE_REFUSED    0x04
 
-
-
-
 /* Information Element types */
 
 #pragma pack(1)
@@ -477,7 +473,6 @@ typedef struct _WLAN_IE_TPC_REP {
     u8                byLinkMargin;
 } WLAN_IE_TPC_REP, *PWLAN_IE_TPC_REP;
 
-
 typedef struct _WLAN_IE_IBSS_DFS {
     u8                byElementID;
     u8                len;
@@ -715,7 +710,6 @@ typedef struct tagWLAN_FR_DEAUTHEN {
 
 } WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;
 
-
 void
 vMgrEncodeBeacon(
       PWLAN_FR_BEACON  pFrame

diff --git a/trunk/drivers/staging/vt6656/aes_ccmp.c b/trunk/drivers/staging/vt6656/aes_ccmp.c
@@ -33,9 +33,6 @@
 #include "device.h"
 #include "80211hdr.h"
 
-
-
-
 /*
  * SBOX Table
  */
@@ -97,9 +94,6 @@ u8 dot3_table[256] = {
 	0x0b, 0x08, 0x0d, 0x0e, 0x07, 0x04, 0x01, 0x02, 0x13, 0x10, 0x15, 0x16, 0x1f, 0x1c, 0x19, 0x1a
 };
 
-
-
-
 static void xor_128(u8 *a, u8 *b, u8 *out)
 {
 	u32 * dwPtrA = (u32 *) a;
@@ -112,7 +106,6 @@ static void xor_128(u8 *a, u8 *b, u8 *out)
 	(*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);
 }
 
-
 static void xor_32(u8 *a, u8 *b, u8 *out)
 {
 	u32 * dwPtrA = (u32 *) a;

diff --git a/trunk/drivers/staging/vt6656/aes_ccmp.h b/trunk/drivers/staging/vt6656/aes_ccmp.h
@@ -30,10 +30,6 @@
 #ifndef __AES_H__
 #define __AES_H__
 
-
-
-
-
 bool AESbGenCCMP(u8 * pbyRxKey, u8 * pbyFrame, u16 wFrameSize);
 
 #endif /* __AES_CCMP_H__ */