Skip to content

L
linux
Commit 96d69e20 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: Remove unnecessary blank lines 

Remove a bunch of useless vertical whitespace.

Convert 3 or more consecutive newlines to 2.
Remove blank lines after open brace and before close brace.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bda2a44e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1557 deletions
drivers/staging/vt6655/80211hdr.h
View file @ 96d69e20
......@@ -86,7 +86,6 @@
#define WLAN_DATA_MAXLEN 2312
#define WLAN_A3FR_MAXLEN (WLAN_HDR_ADDR3_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)
#define WLAN_BEACON_FR_MAXLEN WLAN_A3FR_MAXLEN
#define WLAN_ATIM_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0)
#define WLAN_NULLDATA_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0)
......@@ -100,7 +99,6 @@
#define WLAN_AUTHEN_FR_MAXLEN WLAN_A3FR_MAXLEN
#define WLAN_DEAUTHEN_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 2)
#define WLAN_WEP_NKEYS 4
#define WLAN_WEP40_KEYLEN 5
#define WLAN_WEP104_KEYLEN 13
......@@ -122,7 +120,6 @@
#define WLAN_FTYPE_CTL 0x01
#define WLAN_FTYPE_DATA 0x02
/* Frame Subtypes */
#define WLAN_FSTYPE_ASSOCREQ 0x00
#define WLAN_FSTYPE_ASSOCRESP 0x01
......@@ -155,7 +152,6 @@
#define WLAN_FSTYPE_CFPOLL 0x06
#define WLAN_FSTYPE_CFACK_CFPOLL 0x07
#ifdef __BIG_ENDIAN
/* GET & SET Frame Control bit */
......@@ -175,7 +171,6 @@
#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n) >> 8) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n) >> 8) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
/* Capability Field bit */
#define WLAN_GET_CAP_INFO_ESS(n) (((n) >> 8) & BIT0)
#define WLAN_GET_CAP_INFO_IBSS(n) ((((n) >> 8) & BIT1) >> 1)
......@@ -190,7 +185,6 @@
#define WLAN_GET_CAP_INFO_DSSSOFDM(n) ((((n)) & BIT13) >> 13)
#define WLAN_GET_CAP_INFO_GRPACK(n) ((((n)) & BIT14) >> 14)
#else
/* GET & SET Frame Control bit */
......@@ -206,12 +200,10 @@
#define WLAN_GET_FC_ISWEP(n) ((((unsigned short)(n)) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((unsigned short)(n)) & (BIT15)) >> 15)
/* Sequence Field bit */
#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n)) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
/* Capability Field bit */
#define WLAN_GET_CAP_INFO_ESS(n) ((n) & BIT0)
#define WLAN_GET_CAP_INFO_IBSS(n) (((n) & BIT1) >> 1)
......@@ -226,10 +218,8 @@
#define WLAN_GET_CAP_INFO_DSSSOFDM(n) (((n) & BIT13) >> 13)
#define WLAN_GET_CAP_INFO_GRPACK(n) (((n) & BIT14) >> 14)
#endif /*#ifdef __BIG_ENDIAN */
#define WLAN_SET_CAP_INFO_ESS(n) (n)
#define WLAN_SET_CAP_INFO_IBSS(n) ((n) << 1)
#define WLAN_SET_CAP_INFO_CFPOLLABLE(n) ((n) << 2)
......@@ -243,7 +233,6 @@
#define WLAN_SET_CAP_INFO_DSSSOFDM(n) ((n) << 13)
#define WLAN_SET_CAP_INFO_GRPACK(n) ((n) << 14)
#define WLAN_SET_FC_PRVER(n) ((unsigned short)(n))
#define WLAN_SET_FC_FTYPE(n) (((unsigned short)(n)) << 2)
#define WLAN_SET_FC_FSTYPE(n) (((unsigned short)(n)) << 4)
......@@ -269,8 +258,6 @@
#define WLAN_SET_ERP_USE_PROTECTION(n) ((n) << 1)
#define WLAN_SET_ERP_BARKER_MODE(n) ((n) << 2)
/* Support & Basic Rates field */
#define WLAN_MGMT_IS_BASICRATE(b) ((b) & BIT7)
#define WLAN_MGMT_GET_RATE(b) ((b) & ~BIT7)
......@@ -294,29 +281,24 @@ typedef struct {
/* 802.11 Header Format */
typedef struct tagWLAN_80211HDR_A2 {
unsigned short wFrameCtl;
unsigned short wDurationID;
unsigned char abyAddr1[WLAN_ADDR_LEN];
unsigned char abyAddr2[WLAN_ADDR_LEN];
} __attribute__ ((__packed__))
WLAN_80211HDR_A2, *PWLAN_80211HDR_A2;
typedef struct tagWLAN_80211HDR_A3 {
unsigned short wFrameCtl;
unsigned short wDurationID;
unsigned char abyAddr1[WLAN_ADDR_LEN];
unsigned char abyAddr2[WLAN_ADDR_LEN];
unsigned char abyAddr3[WLAN_ADDR_LEN];
unsigned short wSeqCtl;
} __attribute__ ((__packed__))
WLAN_80211HDR_A3, *PWLAN_80211HDR_A3;
typedef struct tagWLAN_80211HDR_A4 {
unsigned short wFrameCtl;
unsigned short wDurationID;
unsigned char abyAddr1[WLAN_ADDR_LEN];
......@@ -324,28 +306,19 @@ typedef struct tagWLAN_80211HDR_A4 {
unsigned char abyAddr3[WLAN_ADDR_LEN];
unsigned short wSeqCtl;
unsigned char abyAddr4[WLAN_ADDR_LEN];
} __attribute__ ((__packed__))
WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;
typedef union tagUWLAN_80211HDR {
WLAN_80211HDR_A2 sA2;
WLAN_80211HDR_A3 sA3;
WLAN_80211HDR_A4 sA4;
} UWLAN_80211HDR, *PUWLAN_80211HDR;
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
#endif /* __80211HDR_H__ */
drivers/staging/vt6655/80211mgr.c
View file @ 96d69e20
......@@ -61,8 +61,6 @@
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/
......@@ -71,14 +69,10 @@ static int msglevel = MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG;
/*--------------------- Static Functions --------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
/*+
*
* Routine Description:
......@@ -120,7 +114,6 @@ vMgrEncodeBeacon(
*
-*/
void
vMgrDecodeBeacon(
PWLAN_FR_BEACON pFrame
......@@ -142,7 +135,6 @@ vMgrDecodeBeacon(
pItem = (PWLAN_IE)((unsigned char *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
+ WLAN_BEACON_OFF_SSID);
while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
......@@ -229,7 +221,6 @@ vMgrDecodeBeacon(
return;
}
/*+
*
* Routine Description:
......@@ -241,7 +232,6 @@ vMgrDecodeBeacon(
*
-*/
void
vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
......@@ -253,7 +243,6 @@ vMgrEncodeIBSSATIM(
return;
}
/*+
*
* Routine Description:
......@@ -275,7 +264,6 @@ vMgrDecodeIBSSATIM(
return;
}
/*+
*
* Routine Description:
......@@ -294,7 +282,6 @@ vMgrEncodeDisassociation(
{
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
// Fixed Fields
pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_DISASSOC_OFF_REASON);
......@@ -303,7 +290,6 @@ vMgrEncodeDisassociation(
return;
}
/*+
*
* Routine Description:
......@@ -340,7 +326,6 @@ vMgrDecodeDisassociation(
*
-*/
void
vMgrEncodeAssocRequest(
PWLAN_FR_ASSOCREQ pFrame
......@@ -356,7 +341,6 @@ vMgrEncodeAssocRequest(
return;
}
/*+
*
* Routine Description: (AP)
......@@ -454,7 +438,6 @@ vMgrEncodeAssocResponse(
return;
}
/*+
*
* Routine Description:
......@@ -500,7 +483,6 @@ vMgrDecodeAssocResponse(
return;
}
/*+
*
* Routine Description:
......@@ -531,7 +513,6 @@ vMgrEncodeReassocRequest(
return;
}
/*+
*
* Routine Description: (AP)
......@@ -543,7 +524,6 @@ vMgrEncodeReassocRequest(
*
-*/
void
vMgrDecodeReassocRequest(
PWLAN_FR_REASSOCREQ pFrame
......@@ -565,7 +545,6 @@ vMgrDecodeReassocRequest(
+ WLAN_REASSOCREQ_OFF_SSID);
while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
......@@ -602,8 +581,6 @@ vMgrDecodeReassocRequest(
return;
}
/*+
*
* Routine Description:
......@@ -615,7 +592,6 @@ vMgrDecodeReassocRequest(
*
-*/
void
vMgrEncodeProbeRequest(
PWLAN_FR_PROBEREQ pFrame
......@@ -650,7 +626,6 @@ vMgrDecodeProbeRequest(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)));
while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
......@@ -677,7 +652,6 @@ vMgrDecodeProbeRequest(
return;
}
/*+
*
* Routine Description:
......@@ -689,7 +663,6 @@ vMgrDecodeProbeRequest(
*
-*/
void
vMgrEncodeProbeResponse(
PWLAN_FR_PROBERESP pFrame
......@@ -711,8 +684,6 @@ vMgrEncodeProbeResponse(
return;
}
/*+
*
* Routine Description:
......@@ -731,7 +702,6 @@ vMgrDecodeProbeResponse(
{
PWLAN_IE pItem;
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
// Fixed Fields
......@@ -826,7 +796,6 @@ vMgrDecodeProbeResponse(
return;
}
/*+
*
* Routine Description:
......@@ -857,7 +826,6 @@ vMgrEncodeAuthen(
return;
}
/*+
*
* Routine Description:
......@@ -897,7 +865,6 @@ vMgrDecodeAuthen(
return;
}
/*+
*
* Routine Description:
......@@ -924,7 +891,6 @@ vMgrEncodeDeauthen(
return;
}
/*+
*
* Routine Description:
......@@ -950,7 +916,6 @@ vMgrDecodeDeauthen(
return;
}
/*+
*
* Routine Description: (AP)
......@@ -982,7 +947,6 @@ vMgrEncodeReassocResponse(
return;
}
/*+
*
* Routine Description:
......@@ -994,7 +958,6 @@ vMgrEncodeReassocResponse(
*
-*/
void
vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
......
drivers/staging/vt6655/80211mgr.h
View file @ 96d69e20
......@@ -65,7 +65,6 @@
// reference WiFi WPA spec.
#define WLAN_EID_RSN_WPA 221
#define WLAN_EID_ERP_NONERP_PRESENT 0x01
#define WLAN_EID_ERP_USE_PROTECTION 0x02
#define WLAN_EID_ERP_BARKER_MODE 0x04
......@@ -132,14 +131,10 @@
#define WLAN_MGMT_STATUS_INVALID_RSN_IE_CAP 45
#define WLAN_MGMT_STATUS_CIPHER_REJECT 46
// Auth Algorithm
#define WLAN_AUTH_ALG_OPENSYSTEM 0
#define WLAN_AUTH_ALG_SHAREDKEY 1
// Management Frame Field Offsets
// Note: Not all fields are listed because of variable lengths.
// Note: These offsets are from the start of the frame data
......@@ -184,7 +179,6 @@
#define WLAN_DEAUTHEN_OFF_REASON 0
//
// Cipher Suite Selectors defined in 802.11i
//
......@@ -217,15 +211,12 @@
#define MEASURE_MODE_INCAPABLE 0x02
#define MEASURE_MODE_REFUSED 0x04
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
// Information Element Types
#pragma pack(1)
......@@ -235,7 +226,6 @@ typedef struct tagWLAN_IE {
} __attribute__ ((__packed__))
WLAN_IE, *PWLAN_IE;
// Service Set Identity (SSID)
#pragma pack(1)
typedef struct tagWLAN_IE_SSID {
......@@ -245,7 +235,6 @@ typedef struct tagWLAN_IE_SSID {
} __attribute__ ((__packed__))
WLAN_IE_SSID, *PWLAN_IE_SSID;
// Supported Rates
#pragma pack(1)
typedef struct tagWLAN_IE_SUPP_RATES {
......@@ -255,8 +244,6 @@ typedef struct tagWLAN_IE_SUPP_RATES {
} __attribute__ ((__packed__))
WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES;
// FH Parameter Set
#pragma pack(1)
typedef struct _WLAN_IE_FH_PARMS {
......@@ -277,7 +264,6 @@ typedef struct tagWLAN_IE_DS_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_DS_PARMS, *PWLAN_IE_DS_PARMS;
// CF Parameter Set
#pragma pack(1)
typedef struct tagWLAN_IE_CF_PARMS {
......@@ -290,7 +276,6 @@ typedef struct tagWLAN_IE_CF_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_CF_PARMS, *PWLAN_IE_CF_PARMS;
// TIM
#pragma pack(1)
typedef struct tagWLAN_IE_TIM {
......@@ -303,7 +288,6 @@ typedef struct tagWLAN_IE_TIM {
} __attribute__ ((__packed__))
WLAN_IE_TIM, *PWLAN_IE_TIM;
// IBSS Parameter Set
#pragma pack(1)
typedef struct tagWLAN_IE_IBSS_PARMS {
......@@ -313,7 +297,6 @@ typedef struct tagWLAN_IE_IBSS_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;
// Challenge Text
#pragma pack(1)
typedef struct tagWLAN_IE_CHALLENGE {
......@@ -323,7 +306,6 @@ typedef struct tagWLAN_IE_CHALLENGE {
} __attribute__ ((__packed__))
WLAN_IE_CHALLENGE, *PWLAN_IE_CHALLENGE;
#pragma pack(1)
typedef struct tagWLAN_IE_RSN_EXT {
unsigned char byElementID;
......@@ -355,7 +337,6 @@ typedef struct tagWLAN_IE_RSN {
unsigned char abyRSN[WLAN_MIN_ARRAY];
} WLAN_IE_RSN, *PWLAN_IE_RSN;
// ERP
#pragma pack(1)
typedef struct tagWLAN_IE_ERP {
......@@ -365,7 +346,6 @@ typedef struct tagWLAN_IE_ERP {
} __attribute__ ((__packed__))
WLAN_IE_ERP, *PWLAN_IE_ERP;
#pragma pack(1)
typedef struct _MEASEURE_REQ {
unsigned char byChannel;
......@@ -398,11 +378,9 @@ typedef struct _MEASEURE_REP_RPI {
} MEASEURE_REP_RPI, *PMEASEURE_REP_RPI;
typedef union _MEASEURE_REP {
MEASEURE_REP_BASIC sBasic;
MEASEURE_REP_CCA sCCA;
MEASEURE_REP_RPI sRPI;
} MEASEURE_REP, *PMEASEURE_REP;
typedef struct _WLAN_IE_MEASURE_REQ {
......@@ -478,7 +456,6 @@ typedef struct _WLAN_IE_TPC_REP {
unsigned char byLinkMargin;
} WLAN_IE_TPC_REP, *PWLAN_IE_TPC_REP;
typedef struct _WLAN_IE_IBSS_DFS {
unsigned char byElementID;
unsigned char len;
......@@ -489,22 +466,17 @@ typedef struct _WLAN_IE_IBSS_DFS {
#pragma pack()
// Frame Types
// prototype structure, all mgmt frame types will start with these members
typedef struct tagWLAN_FR_MGMT {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
} WLAN_FR_MGMT, *PWLAN_FR_MGMT;
// Beacon frame
typedef struct tagWLAN_FR_BEACON {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -530,13 +502,10 @@ typedef struct tagWLAN_FR_BEACON {
PWLAN_IE_CH_SW pIE_CHSW;
PWLAN_IE_IBSS_DFS pIE_IBSSDFS;
PWLAN_IE_QUIET pIE_Quiet;
} WLAN_FR_BEACON, *PWLAN_FR_BEACON;
// IBSS ATIM frame
typedef struct tagWLAN_FR_IBSSATIM {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -545,12 +514,10 @@ typedef struct tagWLAN_FR_IBSSATIM {
// fixed fields
// info elements
// this frame type has a null body
} WLAN_FR_IBSSATIM, *PWLAN_FR_IBSSATIM;
// Disassociation
typedef struct tagWLAN_FR_DISASSOC {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -558,12 +525,10 @@ typedef struct tagWLAN_FR_DISASSOC {
/*-- fixed fields -----------*/
unsigned short *pwReason;
/*-- info elements ----------*/
} WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC;
// Association Request
typedef struct tagWLAN_FR_ASSOCREQ {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -579,12 +544,10 @@ typedef struct tagWLAN_FR_ASSOCREQ {
PWLAN_IE_SUPP_RATES pExtSuppRates;
PWLAN_IE_PW_CAP pCurrPowerCap;
PWLAN_IE_SUPP_CH pCurrSuppCh;
} WLAN_FR_ASSOCREQ, *PWLAN_FR_ASSOCREQ;
// Association Response
typedef struct tagWLAN_FR_ASSOCRESP {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -596,12 +559,10 @@ typedef struct tagWLAN_FR_ASSOCRESP {
/*-- info elements ----------*/
PWLAN_IE_SUPP_RATES pSuppRates;
PWLAN_IE_SUPP_RATES pExtSuppRates;
} WLAN_FR_ASSOCRESP, *PWLAN_FR_ASSOCRESP;
// Reassociation Request
typedef struct tagWLAN_FR_REASSOCREQ {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -618,12 +579,10 @@ typedef struct tagWLAN_FR_REASSOCREQ {
PWLAN_IE_RSN pRSN;
PWLAN_IE_RSN_EXT pRSNWPA;
PWLAN_IE_SUPP_RATES pExtSuppRates;
} WLAN_FR_REASSOCREQ, *PWLAN_FR_REASSOCREQ;
// Reassociation Response
typedef struct tagWLAN_FR_REASSOCRESP {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -635,12 +594,10 @@ typedef struct tagWLAN_FR_REASSOCRESP {
/*-- info elements ----------*/
PWLAN_IE_SUPP_RATES pSuppRates;
PWLAN_IE_SUPP_RATES pExtSuppRates;
} WLAN_FR_REASSOCRESP, *PWLAN_FR_REASSOCRESP;
// Probe Request
typedef struct tagWLAN_FR_PROBEREQ {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -650,12 +607,10 @@ typedef struct tagWLAN_FR_PROBEREQ {
PWLAN_IE_SSID pSSID;
PWLAN_IE_SUPP_RATES pSuppRates;
PWLAN_IE_SUPP_RATES pExtSuppRates;
} WLAN_FR_PROBEREQ, *PWLAN_FR_PROBEREQ;
// Probe Response
typedef struct tagWLAN_FR_PROBERESP {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -679,12 +634,10 @@ typedef struct tagWLAN_FR_PROBERESP {
PWLAN_IE_CH_SW pIE_CHSW;
PWLAN_IE_IBSS_DFS pIE_IBSSDFS;
PWLAN_IE_QUIET pIE_Quiet;
} WLAN_FR_PROBERESP, *PWLAN_FR_PROBERESP;
// Authentication
typedef struct tagWLAN_FR_AUTHEN {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -695,12 +648,10 @@ typedef struct tagWLAN_FR_AUTHEN {
unsigned short *pwStatus;
/*-- info elements ----------*/
PWLAN_IE_CHALLENGE pChallenge;
} WLAN_FR_AUTHEN, *PWLAN_FR_AUTHEN;
// Deauthenication
typedef struct tagWLAN_FR_DEAUTHEN {
unsigned int uType;
unsigned int len;
unsigned char *pBuf;
......@@ -709,7 +660,6 @@ typedef struct tagWLAN_FR_DEAUTHEN {
unsigned short *pwReason;
/*-- info elements ----------*/
} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;
/*--------------------- Export Functions --------------------------*/
......
drivers/staging/vt6655/IEEE11h.c
View file @ 96d69e20
......@@ -120,7 +120,6 @@ static bool s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,
return bResult;
}
static bool s_bRxTPCReq(PSMgmtObject pMgmt,
PWLAN_FRAME_TPCREQ pTPCReq,
unsigned char byRate,
......@@ -195,15 +194,12 @@ static bool s_bRxTPCReq(PSMgmtObject pMgmt,
return true;
/* return CARDbSendPacket(pMgmt->pAdapter, pFrame, PKT_TYPE_802_11_MNG,
sizeof(WLAN_FRAME_TPCREP)); */
}
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
/*+
*
* Description:
......@@ -285,7 +281,6 @@ IEEE11hbMgrRxAction(void *pMgmtHandle, void *pRxPacket)
return true;
}
bool IEEE11hbMSRRepTx(void *pMgmtHandle)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
......@@ -324,6 +319,4 @@ bool IEEE11hbMSRRepTx(void *pMgmtHandle)
return true;
/* return CARDbSendPacket(pMgmt->pAdapter, pMSRRep, PKT_TYPE_802_11_MNG,
uLength); */
}
drivers/staging/vt6655/aes_ccmp.c
View file @ 96d69e20
......@@ -122,7 +122,6 @@ void xor_128(unsigned char *a, unsigned char *b, unsigned char *out)
(*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);
}
void xor_32(unsigned char *a, unsigned char *b, unsigned char *out)
{
unsigned long *dwPtrA = (unsigned long *)a;
......@@ -181,14 +180,12 @@ void ShiftRows(unsigned char *in, unsigned char *out)
void MixColumns(unsigned char *in, unsigned char *out)
{
out[0] = dot2_table[in[0]] ^ dot3_table[in[1]] ^ in[2] ^ in[3];
out[1] = in[0] ^ dot2_table[in[1]] ^ dot3_table[in[2]] ^ in[3];
out[2] = in[0] ^ in[1] ^ dot2_table[in[2]] ^ dot3_table[in[3]];
out[3] = dot3_table[in[0]] ^ in[1] ^ in[2] ^ dot2_table[in[3]];
}
void AESv128(unsigned char *key, unsigned char *data, unsigned char *ciphertext)
{
int i;
......@@ -220,7 +217,6 @@ void AESv128(unsigned char *key, unsigned char *data, unsigned char *ciphertext)
AddRoundKey(abyRoundKey, round);
}
}
}
/*
......@@ -259,7 +255,6 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor
unsigned short wCnt;
int ii, jj, kk;
pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
if (WLAN_GET_FC_TODS(*(unsigned short *)pbyFrame) &&
WLAN_GET_FC_FROMDS(*(unsigned short *)pbyFrame)) {
......@@ -330,7 +325,6 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor
memcpy(&(abyCTRPLD[1]), &(abyNonce[0]), 13);
for (jj = wPayloadSize; jj > 16; jj = jj - 16) {
abyCTRPLD[14] = (unsigned char)(wCnt >> 8);
abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);
......@@ -392,5 +386,4 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor
} else {
return false;
}
}
drivers/staging/vt6655/baseband.c
View file @ 96d69e20
......@@ -74,8 +74,6 @@ static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Variables --------------------------*/
#define CB_VT3253_INIT_FOR_RFMD 446
unsigned char byVT3253InitTab_RFMD[CB_VT3253_INIT_FOR_RFMD][2] = {
{0x00, 0x30},
......@@ -1248,8 +1246,6 @@ unsigned char byVT3253B0_AIROHA2230[CB_VT3253B0_INIT_FOR_AIROHA2230][2] = {
{0xff, 0x00},
};
#define CB_VT3253B0_INIT_FOR_UW2451 256
//For UW2451
unsigned char byVT3253B0_UW2451[CB_VT3253B0_INIT_FOR_UW2451][2] = {
......@@ -1713,7 +1709,6 @@ unsigned char byVT3253B0_AGC[CB_VT3253B0_AGC][2] = {
const unsigned short awcFrameTime[MAX_RATE] =
{10, 20, 55, 110, 24, 36, 48, 72, 96, 144, 192, 216};
/*--------------------- Static Functions --------------------------*/
static
......@@ -1754,7 +1749,6 @@ s_vChangeAntenna(
}
}
/*--------------------- Export Variables --------------------------*/
/*
* Description: Calculate data frame transmitting time
......@@ -1784,7 +1778,6 @@ BBuGetFrameTime(
unsigned int uRateIdx = (unsigned int) wRate;
unsigned int uRate = 0;
if (uRateIdx > RATE_54M) {
ASSERT(0);
return 0;
......@@ -2026,7 +2019,6 @@ bool BBbReadEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch
return true;
}
/*
* Description: Write a Byte to BASEBAND, by embedded programming
*
......@@ -2068,7 +2060,6 @@ bool BBbWriteEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned c
return true;
}
/*
* Description: Test if all bits are set for the Baseband register
*
......@@ -2091,7 +2082,6 @@ bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned cha
return (byOrgData & byTestBits) == byTestBits;
}
/*
* Description: Test if all bits are clear for the Baseband register
*
......@@ -2289,8 +2279,6 @@ bool BBbVT3253Init(PSDevice pDevice)
return bResult;
}
/*
* Description: Read All Baseband Registers
*
......@@ -2328,7 +2316,6 @@ void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs)
*
*/
void BBvLoopbackOn(PSDevice pDevice)
{
unsigned char byData;
......@@ -2402,11 +2389,8 @@ void BBvLoopbackOff(PSDevice pDevice)
}
BBbReadEmbedded(dwIoBase, 0x0E, &byData);//CR14
BBbWriteEmbedded(dwIoBase, 0x0E, (unsigned char)(byData | 0x80));//CR14
}
/*
* Description: Set ShortSlotTime mode
*
......@@ -2440,7 +2424,6 @@ BBvSetShortSlotTime(PSDevice pDevice)
}
BBbWriteEmbedded(pDevice->PortOffset, 0x0A, byBBRxConf);//CR10
}
void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData)
......@@ -2462,7 +2445,6 @@ void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData)
BBbWriteEmbedded(pDevice->PortOffset, 0x0A, byBBRxConf);//CR10
}
/*
* Description: Baseband SoftwareReset
*
......@@ -2561,9 +2543,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)
BBbWriteEmbedded(dwIoBase, 0x09, byBBTxConf);//CR09
}
/*
* Description: Set Rx Antenna mode
*
......@@ -2596,7 +2575,6 @@ BBvSetRxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)
BBbWriteEmbedded(dwIoBase, 0x0A, byBBRxConf);//CR10
}
/*
* Description: BBvSetDeepSleep
*
......@@ -2623,8 +2601,6 @@ BBvExitDeepSleep(unsigned long dwIoBase, unsigned char byLocalID)
BBbWriteEmbedded(dwIoBase, 0x0D, 0x01);//CR13
}
static
unsigned long
s_ulGetRatio(PSDevice pDevice)
......@@ -2733,7 +2709,6 @@ s_ulGetRatio(PSDevice pDevice)
return ulRatio;
}
void
BBvClearAntDivSQ3Value(PSDevice pDevice)
{
......@@ -2745,7 +2720,6 @@ BBvClearAntDivSQ3Value(PSDevice pDevice)
}
}
/*
* Description: Antenna Diversity
*
......@@ -2764,7 +2738,6 @@ BBvClearAntDivSQ3Value(PSDevice pDevice)
void
BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ3)
{
if ((byRxRate >= MAX_RATE) || (pDevice->wAntDiversityMaxRate >= MAX_RATE)) {
return;
}
......@@ -2774,13 +2747,11 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ
pDevice->uNumSQ3[byRxRate]++;
if (pDevice->byAntennaState == 0) {
if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ulDiversityNValue=[%d],54M-[%d]\n",
(int)pDevice->ulDiversityNValue, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate]);
if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2) {
pDevice->ulRatio_State0 = s_ulGetRatio(pDevice);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0);
......@@ -2798,7 +2769,6 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ
add_timer(&pDevice->TimerSQ3Tmax1);
} else {
pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
add_timer(&pDevice->TimerSQ3Tmax3);
}
......@@ -2808,7 +2778,6 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ
} else { //byAntennaState == 1
if (pDevice->uDiversityCnt > pDevice->ulDiversityMValue) {
del_timer(&pDevice->TimerSQ3Tmax1);
pDevice->ulRatio_State1 = s_ulGetRatio(pDevice);
......@@ -2868,12 +2837,10 @@ TimerSQ3CallBack(
add_timer(&pDevice->TimerSQ3Tmax3);
add_timer(&pDevice->TimerSQ3Tmax2);
spin_unlock_irq(&pDevice->lock);
return;
}
/*+
*
* Description:
......@@ -2903,7 +2870,6 @@ TimerState1CallBack(
spin_lock_irq(&pDevice->lock);
if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) {
s_vChangeAntenna(pDevice);
pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ);
......@@ -2934,4 +2900,3 @@ TimerState1CallBack(
return;
}
drivers/staging/vt6655/baseband.h
View file @ 96d69e20
......@@ -41,7 +41,6 @@
//
#define BB_MAX_CONTEXT_SIZE 256
//
// Baseband RF pair definition in eeprom (Bits 6..0)
//
......@@ -49,7 +48,6 @@
#define PREAMBLE_LONG 0
#define PREAMBLE_SHORT 1
#define F5G 0
#define F2_4G 1
......@@ -66,7 +64,6 @@
#define TOP_RATE_2M 0x00200000
#define TOP_RATE_1M 0x00100000
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Macros ------------------------------*/
......@@ -77,7 +74,6 @@
#define BBvSetFOE(dwIoBase) \
BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C)
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......
drivers/staging/vt6655/bssdb.c
View file @ 96d69e20
......@@ -60,17 +60,12 @@
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/
static int msglevel = MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG;
const unsigned short awHWRetry0[5][5] = {
{RATE_18M, RATE_18M, RATE_12M, RATE_12M, RATE_12M},
{RATE_24M, RATE_24M, RATE_18M, RATE_12M, RATE_12M},
......@@ -86,8 +81,6 @@ const unsigned short awHWRetry1[5][5] = {
{RATE_54M, RATE_54M, RATE_36M, RATE_18M, RATE_18M}
};
/*--------------------- Static Functions --------------------------*/
void s_vCheckSensitivity(
......@@ -100,19 +93,13 @@ void s_uCalculateLinkQual(
);
#endif
void s_vCheckPreEDThreshold(
void *hDeviceContext
);
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
/*+
*
* Routine Description:
......@@ -194,7 +181,6 @@ BSSpSearchBSSList(
//2007-0721-01<Add>by MikeLiu
pCurrBSS->bSelected = false;
if (pCurrBSS->bActive) {
if (pSSID != NULL) {
// matched SSID
if (!!memcmp(pSSID->abySSID,
......@@ -264,10 +250,8 @@ BSSpSearchBSSList(
}
}
return NULL;
}
/*+
*
* Routine Description:
......@@ -278,7 +262,6 @@ BSSpSearchBSSList(
*
-*/
void
BSSvClearBSSList(
void *hDeviceContext,
......@@ -311,8 +294,6 @@ BSSvClearBSSList(
return;
}
/*+
*
* Routine Description:
......@@ -351,8 +332,6 @@ BSSpAddrIsInBSSList(
return NULL;
};
/*+
*
* Routine Description:
......@@ -384,7 +363,6 @@ BSSbInsertToBSSList(
void *pRxPacketContext
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
......@@ -393,8 +371,6 @@ BSSbInsertToBSSList(
bool bParsingQuiet = false;
PWLAN_IE_QUIET pQuiet = NULL;
pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);
for (ii = 0; ii < MAX_BSS_NUM; ii++) {
......@@ -486,7 +462,6 @@ BSSbInsertToBSSList(
}
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == true)) {
PSKeyItem pTransmitKey = NULL;
bool bIs802_1x = false;
......@@ -498,7 +473,6 @@ BSSbInsertToBSSList(
}
if ((bIs802_1x == true) && (pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len) &&
(!memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) {
bAdd_PMKID_Candidate((void *)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj);
if ((pDevice->bLinkPass == true) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) {
......@@ -567,7 +541,6 @@ BSSbInsertToBSSList(
return true;
}
/*+
*
* Routine Description:
......@@ -609,12 +582,9 @@ BSSbUpdateToBSSList(
bool bParsingQuiet = false;
PWLAN_IE_QUIET pQuiet = NULL;
if (pBSSList == NULL)
return false;
HIDWORD(pBSSList->qwBSSTimestamp) = cpu_to_le32(HIDWORD(qwTimestamp));
LODWORD(pBSSList->qwBSSTimestamp) = cpu_to_le32(LODWORD(qwTimestamp));
pBSSList->wBeaconInterval = cpu_to_le16(wBeaconInterval);
......@@ -743,10 +713,6 @@ BSSbUpdateToBSSList(
return true;
}
/*+
*
* Routine Description:
......@@ -777,8 +743,6 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr,
return false;
};
/*+
*
* Routine Description:
......@@ -792,7 +756,6 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr,
void
BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii;
......@@ -837,8 +800,6 @@ BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)
return;
};
/*+
*
* Routine Description:
......@@ -855,13 +816,11 @@ BSSvRemoveOneNode(
unsigned int uNodeIndex
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
struct sk_buff *skb;
while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[uNodeIndex].sTxPSQueue)) != NULL)
dev_kfree_skb(skb);
// clear context
......@@ -926,13 +885,8 @@ BSSvUpdateAPNode(
// Auto rate fallback function initiation.
// RATEbInit(pDevice);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->sNodeDBTable[0].wTxDataRate = %d \n", pMgmt->sNodeDBTable[0].wTxDataRate);
};
/*+
*
* Routine Description:
......@@ -944,7 +898,6 @@ BSSvUpdateAPNode(
*
-*/
void
BSSvAddMulticastNode(
void *hDeviceContext
......@@ -974,13 +927,8 @@ BSSvAddMulticastNode(
printk("BSSvAddMultiCastNode:pMgmt->sNodeDBTable[0].wTxDataRate is %d\n", pMgmt->sNodeDBTable[0].wTxDataRate);
#endif
pMgmt->sNodeDBTable[0].uRatePollTimeout = FALLBACK_POLL_SECOND;
};
/*+
*
* Routine Description:
......@@ -1024,7 +972,6 @@ BSSvSecondCallBack(
if (((!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == false)) || ((pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == true))) && (cc == false)) {
cc = true;
} else if (cc == true) {
if (pDevice->bHWRadioOff == true) {
if (!(pDevice->byGPIO & GPIO0_DATA))
//||(!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV)))
......@@ -1072,7 +1019,6 @@ BSSvSecondCallBack(
start:
#endif
if (pDevice->wUseProtectCntDown > 0) {
pDevice->wUseProtectCntDown--;
} else {
......@@ -1103,7 +1049,6 @@ BSSvSecondCallBack(
#endif
for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
if (pMgmt->sNodeDBTable[ii].bActive) {
// Increase in-activity counter
pMgmt->sNodeDBTable[ii].uInActiveCount++;
......@@ -1117,7 +1062,6 @@ BSSvSecondCallBack(
}
if (pMgmt->sNodeDBTable[ii].eNodeState >= NODE_ASSOC) {
pDevice->uAssocCount++;
// check if Non ERP exist
......@@ -1139,7 +1083,6 @@ BSSvSecondCallBack(
if (pMgmt->sNodeDBTable[ii].bPSEnable)
uSleepySTACnt++;
}
// Rate fallback check
......@@ -1180,9 +1123,7 @@ BSSvSecondCallBack(
}
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->eCurrentPHYType == PHY_TYPE_11G)) {
// on/off protect mode
if (WLAN_GET_ERP_USE_PROTECTION(pDevice->byERPFlag)) {
if (!pDevice->bProtectMode) {
......@@ -1227,7 +1168,6 @@ BSSvSecondCallBack(
}
// Check if any STA in PS mode, enable DTIM multicast deliver
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
if (uSleepySTACnt > 0)
......@@ -1241,7 +1181,6 @@ BSSvSecondCallBack(
if ((pMgmt->eCurrMode == WMAC_MODE_STANDBY) ||
(pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) {
if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS
if (pDevice->bUpdateBBVGA) {
// s_vCheckSensitivity((void *) pDevice);
......@@ -1323,7 +1262,6 @@ BSSvSecondCallBack(
};
}
if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
if (pDevice->bUpdateBBVGA) {
//s_vCheckSensitivity((void *) pDevice);
s_vCheckPreEDThreshold((void *)pDevice);
......@@ -1345,9 +1283,6 @@ BSSvSecondCallBack(
return;
}
/*+
*
* Routine Description:
......@@ -1361,8 +1296,6 @@ BSSvSecondCallBack(
*
-*/
void
BSSvUpdateNodeTxCounter(
void *hDeviceContext,
......@@ -1438,7 +1371,6 @@ BSSvUpdateNodeTxCounter(
//for (ii=0;ii<txRetryTemp;ii++)
{
if (ii < 5) {
//PLICE_DEBUG
wFallBackRate = awHWRetry0[wRate-RATE_18M][ii];
//wFallBackRate = awHWRetry0[wRate-RATE_12M][ii];
......@@ -1462,7 +1394,6 @@ BSSvUpdateNodeTxCounter(
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
(pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
pMACHeader = (PS802_11Header)(pbyBuffer + uFIFOHeaderSize);
if (BSSDBbIsSTAInNodeDB((void *)pMgmt, &(pMACHeader->abyAddr1[0]), &uNodeIndex)) {
......@@ -1517,13 +1448,8 @@ BSSvUpdateNodeTxCounter(
}
return;
}
/*+
*
* Routine Description:
......@@ -1542,7 +1468,6 @@ BSSvUpdateNodeTxCounter(
*
-*/
void
BSSvClearNodeDBTable(
void *hDeviceContext,
......@@ -1571,7 +1496,6 @@ BSSvClearNodeDBTable(
return;
};
void s_vCheckSensitivity(
void *hDeviceContext
)
......@@ -1620,7 +1544,6 @@ void s_vCheckSensitivity(
}
}
void
BSSvClearAnyBSSJoinRecord(
void *hDeviceContext
......@@ -1697,4 +1620,3 @@ void s_vCheckPreEDThreshold(
}
return;
}
drivers/staging/vt6655/bssdb.h
View file @ 96d69e20
......@@ -67,12 +67,10 @@
#define MAX_WPA_IE_LEN 64
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
//
......@@ -88,13 +86,11 @@ typedef enum _NDIS_802_11_NETWORK_TYPE
Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct tagSERPObject {
bool bERPExist;
unsigned char byERP;
} ERPObject, *PERPObject;
typedef struct tagSRSNCapObject {
bool bRSNCapExist;
unsigned short wRSNCap;
......@@ -162,7 +158,6 @@ typedef struct tagKnownBSS {
ERPObject sERP;
SRSNCapObject sRSNCapObj;
unsigned char abyIEs[1024]; // don't move this field !!
} __attribute__ ((__packed__))
KnownBSS , *PKnownBSS;
......@@ -177,7 +172,6 @@ typedef enum tagNODE_STATE {
NODE_ASSOC
} NODE_STATE, *PNODE_STATE;
// STA node info
typedef struct tagKnownNodeDB {
// STA info
......@@ -234,14 +228,10 @@ typedef struct tagKnownNodeDB {
unsigned int uTxOk[MAX_RATE+1];
unsigned int uTxFail[MAX_RATE+1];
unsigned int uTimeCount;
} KnownNodeDB, *PKnownNodeDB;
/*--------------------- Export Functions --------------------------*/
PKnownBSS
BSSpSearchBSSList(
void *hDeviceContext,
......@@ -284,7 +274,6 @@ BSSbInsertToBSSList(
void *pRxPacketContext
);
bool
BSSbUpdateToBSSList(
void *hDeviceContext,
......@@ -307,7 +296,6 @@ BSSbUpdateToBSSList(
void *pRxPacketContext
);
bool
BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr,
unsigned int *puNodeIndex);
......@@ -323,13 +311,11 @@ BSSvUpdateAPNode(
PWLAN_IE_SUPP_RATES pExtSuppRates
);
void
BSSvSecondCallBack(
void *hDeviceContext
);
void
BSSvUpdateNodeTxCounter(
void *hDeviceContext,
......@@ -350,7 +336,6 @@ BSSvAddMulticastNode(
void *hDeviceContext
);
void
BSSvClearNodeDBTable(
void *hDeviceContext,
......
drivers/staging/vt6655/card.c
View file @ 96d69e20
......@@ -68,7 +68,6 @@ static int msglevel = MSG_LEVEL_INFO;
#define C_EIFS 80 // micro sec.
#define C_SLOT_SHORT 9 // micro sec.
#define C_SLOT_LONG 20
......@@ -88,14 +87,11 @@ static unsigned char abyDefaultSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x1
//1M, 2M, 5M, 11M,
static unsigned char abyDefaultSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
/*--------------------- Static Variables --------------------------*/
const unsigned short cwRXBCNTSFOff[MAX_RATE] =
{17, 17, 17, 17, 34, 23, 17, 11, 8, 5, 4, 3};
/*--------------------- Static Functions --------------------------*/
static
......@@ -107,7 +103,6 @@ s_vCalculateOFDMRParameter(
unsigned char *pbyRsvTime
);
/*--------------------- Export Functions --------------------------*/
/*
......@@ -217,8 +212,6 @@ s_vCalculateOFDMRParameter(
}
}
/*
* Description: Set RSPINF
*
......@@ -375,7 +368,6 @@ s_vSetRSPINF(PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, v
}
*/
/*
* Description: Get Card short preamble option value
*
......@@ -415,7 +407,6 @@ bool CARDbIsShorSlotTime(void *pDeviceHandler)
return pDevice->bShortSlotTime;
}
/*
* Description: Update IFS
*
......@@ -440,7 +431,6 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned
PWLAN_IE_SUPP_RATES pSupportRates = (PWLAN_IE_SUPP_RATES) pvSupportRateIEs;
PWLAN_IE_SUPP_RATES pExtSupportRates = (PWLAN_IE_SUPP_RATES) pvExtSupportRateIEs;
//Set SIFS, DIFS, EIFS, SlotTime, CwMin
if (ePHYType == PHY_TYPE_11A) {
if (pSupportRates == NULL) {
......@@ -635,7 +625,6 @@ bool CARDbUpdateTSF(void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTim
return true;
}
/*
* Description: Set NIC TSF counter for first Beacon time
* Get NEXTTBTT from adjusted TSF and Beacon Interval
......@@ -689,8 +678,6 @@ bool CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval)
return true;
}
/*
* Description: Card Stop Hardware Tx
*
......@@ -708,7 +695,6 @@ bool CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
if (ePktType == PKT_TYPE_802_11_ALL) {
pDevice->bStopBeacon = true;
pDevice->bStopTx0Pkt = true;
......@@ -748,7 +734,6 @@ bool CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType)
return true;
}
/*
* Description: Card Start Hardware Tx
*
......@@ -766,7 +751,6 @@ bool CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
if (ePktType == PKT_TYPE_802_11_ALL) {
pDevice->bStopBeacon = false;
pDevice->bStopTx0Pkt = false;
......@@ -788,8 +772,6 @@ bool CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType)
return true;
}
/*
* Description: Card Set BSSID value
*
......@@ -838,7 +820,6 @@ bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e
return true;
}
/*
* Description: Card indicate status
*
......@@ -853,9 +834,6 @@ bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e
*
*/
/*
* Description: Save Assoc info. contain in assoc. response frame
*
......@@ -945,9 +923,7 @@ bool CARDbRadioPowerOff(void *pDeviceHandler)
if (pDevice->bRadioOff == true)
return true;
switch (pDevice->byRFType) {
case RF_RFMD2959:
MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_TXPEINV);
MACvWordRegBitsOn(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1);
......@@ -973,7 +949,6 @@ bool CARDbRadioPowerOff(void *pDeviceHandler)
return bResult;
}
/*
* Description: Turn on Radio power
*
......@@ -1005,7 +980,6 @@ bool CARDbRadioPowerOn(void *pDeviceHandler)
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_RXON);
switch (pDevice->byRFType) {
case RF_RFMD2959:
MACvWordRegBitsOn(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_TXPEINV);
MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1);
......@@ -1027,8 +1001,6 @@ bool CARDbRadioPowerOn(void *pDeviceHandler)
return bResult;
}
bool CARDbRemoveKey(void *pDeviceHandler, unsigned char *pbyBSSID)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
......@@ -1037,7 +1009,6 @@ bool CARDbRemoveKey(void *pDeviceHandler, unsigned char *pbyBSSID)
return true;
}
/*
*
* Description:
......@@ -1078,7 +1049,6 @@ CARDbAdd_PMKID_Candidate(
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\n");
// Update Old Candidate
for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
......@@ -1241,7 +1211,6 @@ CARDbStartMeasure(
return true;
}
/*
*
* Description:
......@@ -1284,7 +1253,6 @@ CARDbChannelSwitch(
return bResult;
}
/*
*
* Description:
......@@ -1340,7 +1308,6 @@ CARDbSetQuiet(
return true;
}
/*
*
* Description:
......@@ -1476,7 +1443,6 @@ CARDvSetPowerConstraint(
}
}
/*
*
* Description:
......@@ -1574,11 +1540,8 @@ CARDvSafeResetTx(
// set MAC Beacon TX pointer
MACvSetCurrBCNTxDescAddr(pDevice->PortOffset,
(pDevice->tx_beacon_dma));
}
/*+
*
* Description:
......@@ -1602,8 +1565,6 @@ CARDvSafeResetRx(
unsigned int uu;
PSRxDesc pDesc;
// initialize RD index
pDevice->pCurrRD[0] = &(pDevice->aRD0Ring[0]);
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
......@@ -1638,9 +1599,6 @@ CARDvSafeResetRx(
pDevice->rd1_pool_dma);
}
/*
* Description: Get response Control frame rate in CCK mode
*
......@@ -1705,7 +1663,6 @@ unsigned short CARDwGetOFDMControlRate(void *pDeviceHandler, unsigned short wRat
return (unsigned short)RATE_24M;
}
/*
* Description: Set RSPINF
*
......@@ -1920,7 +1877,6 @@ void CARDvUpdateBasicTopRate(void *pDeviceHandler)
pDevice->byTopCCKBasicRate = byTopCCK;
}
/*
* Description: Set NIC Tx Basic Rate
*
......@@ -2001,7 +1957,6 @@ void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode)
// set Baseband loopback
}
/*
* Description: Software Reset NIC
*
......@@ -2025,7 +1980,6 @@ bool CARDbSoftwareReset(void *pDeviceHandler)
return true;
}
/*
* Description: Calculate TSF offset of two TSF input
* Get TSF Offset from RxBCN's TSF and local TSF
......@@ -2063,7 +2017,6 @@ QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2)
return qwTSFOffset;
}
/*
* Description: Read NIC TSF counter
* Get local TSF counter
......@@ -2096,7 +2049,6 @@ bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF)
return true;
}
/*
* Description: Read NIC TSF counter
* Get NEXTTBTT from adjusted TSF and Beacon Interval
......@@ -2113,7 +2065,6 @@ bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF)
*/
QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval)
{
unsigned int uLowNextTBTT;
unsigned int uHighRemain, uLowRemain;
unsigned int uBeaconInterval;
......@@ -2140,7 +2091,6 @@ QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval)
return qwTSF;
}
/*
* Description: Set NIC TSF counter for first Beacon time
* Get NEXTTBTT from adjusted TSF and Beacon Interval
......@@ -2157,7 +2107,6 @@ QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval)
*/
void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval)
{
QWORD qwNextTBTT;
HIDWORD(qwNextTBTT) = 0;
......@@ -2172,7 +2121,6 @@ void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterva
return;
}
/*
* Description: Sync NIC TSF counter for Beacon time
* Get NEXTTBTT and write to HW
......@@ -2190,7 +2138,6 @@ void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterva
*/
void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval)
{
qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
// Set NextTBTT
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF));
......@@ -2201,10 +2148,3 @@ void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBe
return;
}
drivers/staging/vt6655/card.h
View file @ 96d69e20
......@@ -41,7 +41,6 @@
#define CARD_LB_MAC MAKEWORD(MAC_LB_INTERNAL, 0) // PHY must ISO, avoid MAC loopback packet go out
#define CARD_LB_PHY MAKEWORD(MAC_LB_EXT, 0)
#define DEFAULT_MSDU_LIFETIME 512 // ms
#define DEFAULT_MSDU_LIFETIME_RES_64us 8000 // 64us
......@@ -79,8 +78,6 @@ typedef enum _CARD_OP_MODE {
OP_MODE_UNKNOWN
} CARD_OP_MODE, *PCARD_OP_MODE;
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......@@ -127,7 +124,6 @@ bool CARDbSetTxDataRate(
unsigned short wDataRate
);
bool CARDbRemoveKey(void *pDeviceHandler, unsigned char *pbyBSSID);
bool
......@@ -193,6 +189,3 @@ CARDbyGetTransmitPower(
);
#endif // __CARD_H__
drivers/staging/vt6655/channel.c
View file @ 96d69e20
......@@ -391,7 +391,6 @@ bool is_channel_valid(unsigned int ChannelIndex)
exit:
return bValid;
}
/**
......@@ -528,7 +527,6 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
PSDevice pDevice = (PSDevice) pDeviceHandler;
bool bResult = true;
if (pDevice->byCurrentCh == uConnectionChannel) {
return bResult;
}
......@@ -555,7 +553,6 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
}
//}} RobertYu
pDevice->byCurrentCh = (unsigned char)uConnectionChannel;
bResult &= RFbSelectChannel(pDevice->PortOffset, pDevice->byRFType, (unsigned char)uConnectionChannel);
......@@ -563,7 +560,6 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
if (pDevice->bEnablePSMode == true)
RFvWriteWakeProgSyn(pDevice->PortOffset, pDevice->byRFType, uConnectionChannel);
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "CARDbSetMediaChannel: %d\n", (unsigned char)uConnectionChannel);
BBvSoftwareReset(pDevice->PortOffset);
......@@ -603,7 +599,6 @@ void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE)
unsigned char byCh = 0;
PWLAN_IE_COUNTRY pIE_Country = (PWLAN_IE_COUNTRY) pIE;
uNumOfCountryInfo = (pIE_Country->len - 3);
uNumOfCountryInfo /= 3;
......@@ -652,7 +647,6 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs)
unsigned char *pbyChTupple;
unsigned char byLen = 0;
pIE->byElementID = WLAN_EID_SUPP_CH;
pIE->len = 0;
pbyChTupple = pIE->abyChannelTuple;
......@@ -739,7 +733,6 @@ void set_country_IE(void *pDeviceHandler, void *pIE)
bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex,
unsigned char *pbyChannelNumber, unsigned char *pbyMap)
{
if (uChannelIndex > CB_MAX_CHANNEL)
return false;
......@@ -751,7 +744,6 @@ bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex,
void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex,
unsigned char byMap)
{
if (uChannelIndex > CB_MAX_CHANNEL)
return;
......
drivers/staging/vt6655/channel.h
View file @ 96d69e20
......@@ -35,7 +35,6 @@ typedef struct tagSChannelTblElement {
unsigned char byMAP;
} SChannelTblElement, *PSChannelTblElement;
/*--------------------- Export Functions --------------------------*/
bool is_channel_valid(unsigned int CountryCode);
......@@ -54,5 +53,4 @@ void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex,
void clear_channel_map_info(void *pDeviceHandler);
unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
#endif /* _CHANNEL_H_ */
drivers/staging/vt6655/datarate.c
View file @ 96d69e20
......@@ -45,12 +45,8 @@
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
extern unsigned short TxRate_iwconfig; //2008-5-8 <add> by chester
/*--------------------- Static Variables --------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
......@@ -68,8 +64,6 @@ void s_vResetCounter(
PKnownNodeDB psNodeDBTable
);
void
s_vResetCounter(
PKnownNodeDB psNodeDBTable
......@@ -86,10 +80,8 @@ s_vResetCounter(
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
/*+
*
* Description:
......@@ -121,8 +113,6 @@ DATARATEbyGetRateIdx(
return 0;
}
/*+
*
* Routine Description:
......@@ -141,9 +131,6 @@ DATARATEbyGetRateIdx(
#define AUTORATE_TXCNT_THRESHOLD 20
#define AUTORATE_INC_THRESHOLD 30
/*+
*
* Description:
......@@ -214,7 +201,6 @@ RATEvParseMaxRate(
unsigned short wOldBasicRate = pDevice->wBasicRate;
unsigned int uRateLen;
if (pItemRates == NULL)
return;
......@@ -247,7 +233,6 @@ RATEvParseMaxRate(
}
if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) &&
(pDevice->eCurrentPHYType != PHY_TYPE_11B)) {
unsigned int uExtRateLen = pItemExtRates->len;
if (uExtRateLen > WLAN_RATES_MAXLEN)
......@@ -288,7 +273,6 @@ RATEvParseMaxRate(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Exit ParseMaxRate\n");
}
/*+
*
* Routine Description:
......@@ -343,7 +327,6 @@ RATEvTxRateFallBack(
psNodeDBTable->uTimeCount = 0;
}
for (ii = 0; ii < MAX_RATE; ii++) {
if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {
if (bAutoRate[ii] == true) {
......@@ -393,7 +376,6 @@ RATEvTxRateFallBack(
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rate: %d, U:%d, D:%d\n", psNodeDBTable->wTxDataRate, wIdxUpRate, wIdxDownRate);
return;
}
/*+
......@@ -434,4 +416,3 @@ RATEuSetIE(
}
return (unsigned char)uRateCnt;
}
drivers/staging/vt6655/datarate.h
View file @ 96d69e20
......@@ -41,19 +41,14 @@
#define RETRY_TIMES_THRD_H 2 // times
#define RETRY_TIMES_THRD_L 1 // times
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
void
RATEvParseMaxRate(
void *pDeviceHandler,
......@@ -85,11 +80,9 @@ wGetRateIdx(
unsigned char byRate
);
unsigned char
DATARATEbyGetRateIdx(
unsigned char byRate
);
#endif //__DATARATE_H__
drivers/staging/vt6655/desc.h
View file @ 96d69e20
......@@ -110,7 +110,6 @@
#define CB_RD_NUM 32 // default # of RD
#define CB_TD_NUM 32 // default # of TD
// max number of physical segments
// in a single NDIS packet. Above this threshold, the packet
// is copied into a single physically contiguous buffer
......@@ -121,8 +120,6 @@
#define CB_PROTOCOL_RESERVED_SECTION 16
// if retrys excess 15 times , tx will abort, and
// if tx fifo underflow, tx will fail
// we should try to resend it
......@@ -199,8 +196,6 @@
#define TYPE_RXDMA1 1
#define TYPE_MAXRD 2
// TD_INFO flags control bit
#define TD_FLAGS_NETIF_SKB 0x01 // check if need release skb
#define TD_FLAGS_PRIV_SKB 0x02 // check if called from private skb(hostap)
......@@ -265,7 +260,6 @@ typedef struct tagRDES0 {
} __attribute__ ((__packed__))
SRDES0;
#endif
typedef struct tagRDES1 {
......@@ -328,7 +322,6 @@ STDES0;
#endif
typedef struct tagTDES1 {
volatile unsigned short wReqCount;
volatile unsigned char byTCR;
......@@ -336,7 +329,6 @@ typedef struct tagTDES1 {
} __attribute__ ((__packed__))
STDES1;
typedef struct tagDEVICE_TD_INFO {
struct sk_buff *skb;
unsigned char *buf;
......@@ -376,7 +368,6 @@ typedef struct tagSTxDesc {
STxDesc, *PSTxDesc;
typedef const STxDesc *PCSTxDesc;
typedef struct tagSTxSyncDesc {
volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1;
......@@ -391,7 +382,6 @@ typedef struct tagSTxSyncDesc {
STxSyncDesc, *PSTxSyncDesc;
typedef const STxSyncDesc *PCSTxSyncDesc;
//
// RsvTime buffer header
//
......@@ -457,7 +447,6 @@ typedef struct tagSRTS_g {
SRTS_g, *PSRTS_g;
typedef const SRTS_g *PCSRTS_g;
typedef struct tagSRTS_g_FB {
unsigned char bySignalField_b;
unsigned char byServiceField_b;
......@@ -478,7 +467,6 @@ typedef struct tagSRTS_g_FB {
SRTS_g_FB, *PSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB;
typedef struct tagSRTS_ab {
unsigned char bySignalField;
unsigned char byServiceField;
......@@ -490,7 +478,6 @@ typedef struct tagSRTS_ab {
SRTS_ab, *PSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab;
typedef struct tagSRTS_a_FB {
unsigned char bySignalField;
unsigned char byServiceField;
......@@ -504,7 +491,6 @@ typedef struct tagSRTS_a_FB {
SRTS_a_FB, *PSRTS_a_FB;
typedef const SRTS_a_FB *PCSRTS_a_FB;
//
// CTS buffer header
//
......@@ -540,7 +526,6 @@ typedef struct tagSCTS_FB {
SCTS_FB, *PSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB;
//
// Tx FIFO header
//
......@@ -597,7 +582,6 @@ typedef struct tagSTxDataHead_g_FB {
STxDataHead_g_FB, *PSTxDataHead_g_FB;
typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;
typedef struct tagSTxDataHead_ab {
unsigned char bySignalField;
unsigned char byServiceField;
......@@ -608,7 +592,6 @@ typedef struct tagSTxDataHead_ab {
STxDataHead_ab, *PSTxDataHead_ab;
typedef const STxDataHead_ab *PCSTxDataHead_ab;
typedef struct tagSTxDataHead_a_FB {
unsigned char bySignalField;
unsigned char byServiceField;
......@@ -640,7 +623,6 @@ typedef struct tagSBEACONCtl {
} __attribute__ ((__packed__))
SBEACONCtl;
typedef struct tagSSecretKey {
u32 dwLowDword;
unsigned char byHighByte;
......@@ -666,8 +648,4 @@ SKeyEntry;
/*--------------------- Export Functions --------------------------*/
#endif // __DESC_H__
drivers/staging/vt6655/device.h
View file @ 96d69e20
......@@ -87,7 +87,6 @@
#include "key.h"
#include "mac.h"
/*--------------------- Export Definitions -------------------------*/
#define MAC_MAX_CONTEXT_REG (256+128)
......@@ -111,8 +110,6 @@
#define KEYSEL_TKIP 2
#define KEYSEL_CCMP 3
#define AUTO_FB_NONE 0
#define AUTO_FB_0 1
#define AUTO_FB_1 2
......@@ -133,8 +130,6 @@
#define BB_VGA_LEVEL 4
#define BB_VGA_CHANGE_THRESHOLD 16
#ifndef RUN_AT
#define RUN_AT(x) (jiffies+(x))
#endif
......@@ -142,23 +137,18 @@
// DMA related
#define RESERV_AC0DMA 4
// BUILD OBJ mode
#define AVAIL_TD(p, q) ((p)->sOpts.nTxDescs[(q)] - ((p)->iTDUsed[(q)]))
//PLICE_DEBUG ->
#define NUM 64
//PLICE_DEUBG <-
#define PRIVATE_Message 0
/*--------------------- Export Types ------------------------------*/
#define DBG_PRT(l, p, args...) { if (l <= msglevel) printk(p, ##args); }
#define PRINT_K(p, args...) { if (PRIVATE_Message) printk(p, ##args); }
......@@ -179,7 +169,6 @@ typedef enum _VIA_PKT_TYPE
PK_TYPE_11GA
} VIA_PKT_TYPE, *PVIA_PKT_TYPE;
typedef enum __device_msg_level {
MSG_LEVEL_ERR = 0, //Errors that will cause abnormal operation.
MSG_LEVEL_NOTICE = 1, //Some errors need users to be notified.
......@@ -194,7 +183,6 @@ typedef enum __device_init_type {
DEVICE_INIT_DXPL // Dx to D0 power lost init
} DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE;
//++ NDIS related
#define MAX_BSSIDINFO_4_PMKID 16
......@@ -205,7 +193,6 @@ typedef enum __device_init_type {
// PMKID Structures
typedef unsigned char NDIS_802_11_PMKID_VALUE[16];
typedef enum _NDIS_802_11_WEP_STATUS
{
Ndis802_11WEPEnabled,
......@@ -223,7 +210,6 @@ typedef enum _NDIS_802_11_WEP_STATUS
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
typedef enum _NDIS_802_11_STATUS_TYPE
{
Ndis802_11StatusType_Authentication,
......@@ -238,7 +224,6 @@ typedef struct _PMKID_CANDIDATE {
unsigned long Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
typedef struct _BSSID_INFO
{
NDIS_802_11_MAC_ADDRESS BSSID;
......@@ -279,13 +264,11 @@ typedef struct __chip_info_tbl {
u32 flags;
} CHIP_INFO, *PCHIP_INFO;
typedef enum {
OWNED_BY_HOST = 0,
OWNED_BY_NIC = 1
} DEVICE_OWNER_TYPE, *PDEVICE_OWNER_TYPE;
// The receive duplicate detection cache entry
typedef struct tagSCacheEntry {
unsigned short wFmSequence;
......@@ -314,8 +297,6 @@ typedef struct tagSDeFragControlBlock
bool bInUse;
} SDeFragControlBlock, *PSDeFragControlBlock;
//flags for options
#define DEVICE_FLAGS_IP_ALIGN 0x00000001UL
#define DEVICE_FLAGS_PREAMBLE_TYPE 0x00000002UL
......@@ -343,10 +324,8 @@ typedef struct tagSDeFragControlBlock
//for device_set_media_duplex
#define DEVICE_LINK_CHANGE 0x00000001UL
//PLICE_DEBUG->
typedef struct _RxManagementQueue
{
int packet_num;
......@@ -354,11 +333,8 @@ typedef struct _RxManagementQueue
PSRxMgmtPacket Q[NUM];
} RxManagementQueue, *PSRxManagementQueue;
//PLICE_DEBUG<-
typedef struct __device_opt {
int nRxDescs0; //Number of RX descriptors0
int nRxDescs1; //Number of RX descriptors1
......@@ -374,7 +350,6 @@ typedef struct __device_opt {
u32 flags;
} OPTIONS, *POPTIONS;
typedef struct __device_info {
struct __device_info *next;
struct __device_info *prev;
......@@ -456,7 +431,6 @@ typedef struct __device_info {
struct semaphore mlme_semaphore;
//PLICE_DEBUG <-
u32 rx_bytes;
// Version control
......@@ -476,7 +450,6 @@ typedef struct __device_info {
// 802.11 counter
SDot11Counters s802_11Counter;
// 802.11 management
PSMgmtObject pMgmt;
SMgmtObject sMgmtObj;
......@@ -507,7 +480,6 @@ typedef struct __device_info {
unsigned char byCWMaxMin;
CARD_PHY_TYPE eCurrentPHYType;
VIA_BB_TYPE byBBType; //0: 11A, 1:11B, 2:11G
VIA_PKT_TYPE byPacketType; //0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate)
unsigned short wBasicRate;
......@@ -559,7 +531,6 @@ typedef struct __device_info {
bool bPWBitOn;
WMAC_POWER_MODE ePSMode;
// GPIO Radio Control
unsigned char byRadioCtl;
unsigned char byGPIO;
......@@ -597,8 +568,6 @@ typedef struct __device_info {
bool bCmdRunning;
bool bCmdClear;
bool bRoaming;
//WOW
unsigned char abyIPAddr[4];
......@@ -635,16 +604,13 @@ typedef struct __device_info {
// for OID_802_11_ASSOCIATION_INFORMATION
bool bAssocInfoSet;
unsigned char byAutoFBCtrl;
bool bTxMICFail;
bool bRxMICFail;
unsigned int uRATEIdx;
// For Update BaseBand VGA Gain Offset
bool bUpdateBBVGA;
unsigned int uBBVGADiffCount;
......@@ -656,7 +622,6 @@ typedef struct __device_info {
unsigned char byBBPreEDRSSI;
unsigned char byBBPreEDIndex;
bool bRadioCmd;
unsigned long dwDiagRefCount;
......@@ -686,7 +651,6 @@ typedef struct __device_info {
char abyRegPwr[CB_MAX_CHANNEL+1];
char abyLocalPwr[CB_MAX_CHANNEL+1];
// BaseBand Loopback Use
unsigned char byBBCR4d;
unsigned char byBBCRc9;
......@@ -708,7 +672,6 @@ typedef struct __device_info {
unsigned char byReAssocCount; //mike add:re-association retry times!
unsigned char byLinkWaitCount;
unsigned char abyNodeName[17];
bool bDiversityRegCtlON;
......@@ -731,11 +694,9 @@ typedef struct __device_info {
struct timer_list TimerSQ3Tmax2;
struct timer_list TimerSQ3Tmax3;
unsigned long uNumSQ3[MAX_RATE];
unsigned short wAntDiversityMaxRate;
SEthernetHeader sTxEthHeader;
SEthernetHeader sRxEthHeader;
unsigned char abyBroadcastAddr[ETH_ALEN];
......@@ -746,7 +707,6 @@ typedef struct __device_info {
SPMKID gsPMKID;
SPMKIDCandidateEvent gsPMKIDCandidate;
// for 802.11h
bool b11hEnable;
unsigned char abyCountryCode[3];
......@@ -806,13 +766,10 @@ typedef struct __device_info {
struct iw_statistics wstats; // wireless stats
bool bCommit;
} DEVICE_INFO, *PSDevice;
//PLICE_DEBUG->
inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
{
if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head) {
......@@ -824,9 +781,6 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
}
}
inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
{
PSRxMgmtPacket pRxMgmtPacket;
......@@ -846,15 +800,8 @@ inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
void InitRxManagementQueue(PSDevice pDevice);
//PLICE_DEBUG<-
inline static bool device_get_ip(PSDevice pInfo) {
struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr;
struct in_ifaddr *ifa;
......@@ -869,8 +816,6 @@ inline static bool device_get_ip(PSDevice pInfo) {
return false;
}
static inline PDEVICE_RD_INFO alloc_rd_info(void)
{
return kzalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC);
......@@ -887,5 +832,3 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF);
int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter);
#endif
drivers/staging/vt6655/device_cfg.h
View file @ 96d69e20
......@@ -70,18 +70,13 @@ struct _version {
//Max: 2378=2312Payload + 30HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR
#define PKT_BUF_SZ 2390
#define MAX_UINTS 8
#define OPTION_DEFAULT { [0 ... MAX_UINTS-1] = -1}
typedef enum _chip_type {
VT3253 = 1
} CHIP_TYPE, *PCHIP_TYPE;
#ifdef VIAWET_DEBUG
#define ASSERT(x) \
do { \
......@@ -97,5 +92,4 @@ do { \
#define DBG_PORT80(value)
#endif
#endif
drivers/staging/vt6655/device_main.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/dpc.c
View file @ 96d69e20
......@@ -55,8 +55,6 @@
#include "iowpa.h"
#include "aes_ccmp.h"
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
......@@ -68,7 +66,6 @@ static int msglevel = MSG_LEVEL_INFO;
const unsigned char acbyRxRate[MAX_RATE] =
{2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108};
/*--------------------- Static Functions --------------------------*/
/*--------------------- Static Definitions -------------------------*/
......@@ -77,7 +74,6 @@ const unsigned char acbyRxRate[MAX_RATE] =
static unsigned char s_byGetRateIdx(unsigned char byRate);
static void
s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
PSEthernetHeader psEthHeader);
......@@ -93,8 +89,6 @@ static bool s_bAPModeRxCtl(
int iSANodeIndex
);
static bool s_bAPModeRxData(
PSDevice pDevice,
struct sk_buff *skb,
......@@ -104,7 +98,6 @@ static bool s_bAPModeRxData(
int iDANodeIndex
);
static bool s_bHandleRxEncryption(
PSDevice pDevice,
unsigned char *pbyFrame,
......@@ -162,7 +155,6 @@ s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,
PS802_11Header pMACHeader;
int ii;
pMACHeader = (PS802_11Header) (pbyRxBufferAddr + cbHeaderSize);
s_vGetDASA((unsigned char *)pMACHeader, &cbHeaderSize, &pDevice->sRxEthHeader);
......@@ -223,9 +215,6 @@ s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,
*pcbHeadSize = cbHeaderSize;
}
static unsigned char s_byGetRateIdx(unsigned char byRate)
{
unsigned char byRateIdx;
......@@ -237,7 +226,6 @@ static unsigned char s_byGetRateIdx(unsigned char byRate)
return 0;
}
static void
s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
PSEthernetHeader psEthHeader)
......@@ -279,9 +267,6 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
*pcbHeaderSize = cbHeaderSize;
}
//PLICE_DEBUG ->
void MngWorkItem(void *Context)
......@@ -297,18 +282,14 @@ void MngWorkItem(void *Context)
spin_unlock_irq(&pDevice->lock);
}
//PLICE_DEBUG<-
bool
device_receive_frame(
PSDevice pDevice,
PSRxDesc pCurrRD
)
{
PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo;
struct net_device_stats *pStats = &pDevice->stats;
struct sk_buff *skb;
......@@ -350,7 +331,6 @@ device_receive_frame(
skb = pRDInfo->skb;
//PLICE_DEBUG->
#if 1
pci_unmap_single(pDevice->pcid, pRDInfo->skb_dma,
......@@ -436,7 +416,6 @@ device_receive_frame(
}
}
// Use for TKIP MIC
s_vGetDASA(skb->data+4, &cbHeaderSize, &pDevice->sRxEthHeader);
......@@ -461,7 +440,6 @@ device_receive_frame(
}
}
if (IS_FC_WEP(pbyFrame)) {
bool bRxDecryOK = false;
......@@ -509,7 +487,6 @@ device_receive_frame(
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) ||
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) {
if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {
pDevice->s802_11Counter.TKIPICVErrors++;
} else if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP)) {
......@@ -530,7 +507,6 @@ device_receive_frame(
FrameSize -= 4; // 4 is ICV
}
//
// RX OK
//
......@@ -553,7 +529,6 @@ device_receive_frame(
}
}
// Management & Control frame Handle
if ((IS_TYPE_DATA((skb->data+4))) == false) {
// Handle Control & Manage Frame
......@@ -665,10 +640,8 @@ device_receive_frame(
}
}
// Data frame Handle
if (pDevice->bEnablePSMode) {
if (IS_FC_MOREDATA((skb->data+4))) {
if (*pbyRsr & RSR_ADDROK) {
......@@ -688,7 +661,6 @@ device_receive_frame(
BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);
}
if (pDevice->byLocalID != REV_ID_VT3253_B1) {
pDevice->uCurrRSSI = *pbyRSSI;
}
......@@ -747,7 +719,6 @@ device_receive_frame(
return false;
}
if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {
if (bIsWEP) {
FrameSize -= 8; //MIC
......@@ -766,7 +737,6 @@ device_receive_frame(
unsigned long dwLocalMIC_R = 0;
viawget_wpa_header *wpahdr;
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[24]));
dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[28]));
......@@ -799,7 +769,6 @@ device_receive_frame(
//DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) ||
(pDevice->bRxMICFail == true)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MIC comparison is fail!\n");
......@@ -838,7 +807,6 @@ device_receive_frame(
}
#endif
if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
wpahdr = (viawget_wpa_header *)pDevice->skb->data;
if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
......@@ -912,13 +880,10 @@ device_receive_frame(
}
} // ----- End of Reply Counter Check --------------------------
if ((pKey != NULL) && (bIsWEP)) {
// pDevice->s802_11Counter.DecryptSuccessCount.QuadPart++;
}
s_vProcessRxMACHeader(pDevice, (unsigned char *)(skb->data+4), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset);
FrameSize -= cbHeaderOffset;
cbHeaderOffset += 4; // 4 is Rcv buffer header
......@@ -935,7 +900,6 @@ device_receive_frame(
iSANodeIndex,
iDANodeIndex
) == false) {
if (bDeFragRx) {
if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s: can not alloc more frag bufs\n",
......@@ -951,7 +915,6 @@ device_receive_frame(
skb_put(skb, FrameSize);
skb->protocol = eth_type_trans(skb, skb->dev);
//drop frame not met IEEE 802.3
/*
if (pDevice->flags & DEVICE_FLAGS_VAL_PKT_LEN) {
......@@ -986,7 +949,6 @@ device_receive_frame(
return true;
}
static bool s_bAPModeRxCtl(
PSDevice pDevice,
unsigned char *pbyFrame,
......@@ -997,12 +959,9 @@ static bool s_bAPModeRxCtl(
CMD_STATUS Status;
PSMgmtObject pMgmt = pDevice->pMgmt;
if (IS_CTL_PSPOLL(pbyFrame) || !IS_TYPE_CONTROL(pbyFrame)) {
p802_11Header = (PS802_11Header)(pbyFrame);
if (!IS_TYPE_MGMT(pbyFrame)) {
// Data & PS-Poll packet
// check frame class
if (iSANodeIndex > 0) {
......@@ -1086,7 +1045,6 @@ static bool s_bAPModeRxCtl(
}
}
return false;
}
static bool s_bHandleRxEncryption(
......@@ -1108,7 +1066,6 @@ static bool s_bHandleRxEncryption(
unsigned char byDecMode = KEY_CTL_WEP;
PSMgmtObject pMgmt = pDevice->pMgmt;
*pwRxTSC15_0 = 0;
*pdwRxTSC47_16 = 0;
......@@ -1234,7 +1191,6 @@ static bool s_bHandleRxEncryption(
return true;
}
static bool s_bHostWepRxEncryption(
PSDevice pDevice,
unsigned char *pbyFrame,
......@@ -1254,8 +1210,6 @@ static bool s_bHostWepRxEncryption(
unsigned char byDecMode = KEY_CTL_WEP;
PS802_11Header pMACHeader;
*pwRxTSC15_0 = 0;
*pdwRxTSC47_16 = 0;
......@@ -1269,7 +1223,6 @@ static bool s_bHostWepRxEncryption(
byKeyIdx >>= 6;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\nKeyIdx: %d\n", byKeyIdx);
if (pDevice->pMgmt->byCSSGK == KEY_CTL_TKIP)
byDecMode = KEY_CTL_TKIP;
else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP)
......@@ -1323,7 +1276,6 @@ static bool s_bHostWepRxEncryption(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "TSC0_15: %x\n", *pwRxTSC15_0);
if (byDecMode == KEY_CTL_TKIP) {
if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == false)) {
// Software TKIP
// 1. 3253 A
......@@ -1364,8 +1316,6 @@ static bool s_bHostWepRxEncryption(
return true;
}
static bool s_bAPModeRxData(
PSDevice pDevice,
struct sk_buff *skb,
......@@ -1381,7 +1331,6 @@ static bool s_bAPModeRxData(
unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
unsigned short wAID;
struct sk_buff *skbcpy = NULL;
if (FrameSize > CB_MAX_BUF_SIZE)
......@@ -1389,7 +1338,6 @@ static bool s_bAPModeRxData(
// check DA
if (is_multicast_ether_addr((unsigned char *)(skb->data+cbHeaderOffset))) {
if (pMgmt->sNodeDBTable[0].bPSEnable) {
skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);
// if any node in PS mode, buffer packet until DTIM.
......@@ -1450,4 +1398,3 @@ static bool s_bAPModeRxData(
return true;
}
drivers/staging/vt6655/dpc.h
View file @ 96d69e20
......@@ -50,6 +50,3 @@ device_receive_frame(
void MngWorkItem(void *Context);
#endif // __RXTX_H__
drivers/staging/vt6655/hostap.c
View file @ 96d69e20
......@@ -53,12 +53,8 @@ static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/
/*--------------------- Export Variables --------------------------*/
/*
* Description:
* register net_device (AP) for hostap deamon
......@@ -135,7 +131,6 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
{
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: disabling hostapd mode\n", pDevice->dev->name);
if (pDevice->apdev && pDevice->apdev->name && pDevice->apdev->name[0]) {
......@@ -161,7 +156,6 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
return 0;
}
/*
* Description:
* Set enable/disable hostapd mode
......@@ -192,7 +186,6 @@ int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
return hostap_disable_hostapd(pDevice, rtnl_locked);
}
/*
* Description:
* remove station function supported for hostap deamon
......@@ -211,7 +204,6 @@ static int hostap_remove_sta(PSDevice pDevice,
{
unsigned int uNodeIndex;
if (BSSDBbIsSTAInNodeDB(pDevice->pMgmt, param->sta_addr, &uNodeIndex)) {
BSSvRemoveOneNode(pDevice, uNodeIndex);
} else {
......@@ -239,7 +231,6 @@ static int hostap_add_sta(PSDevice pDevice,
PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uNodeIndex;
if (!BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
BSSvCreateOneNode((PSDevice)pDevice, &uNodeIndex);
}
......@@ -373,8 +364,6 @@ static int hostap_set_flags_sta(PSDevice pDevice,
return 0;
}
/*
* Description:
* set generic element (wpa ie)
......@@ -393,8 +382,6 @@ static int hostap_set_generic_element(PSDevice pDevice,
{
PSMgmtObject pMgmt = pDevice->pMgmt;
memcpy(pMgmt->abyWPAIE,
param->u.generic_elem.data,
param->u.generic_elem.len
......@@ -472,7 +459,6 @@ static int hostap_set_encryption(PSDevice pDevice,
bool bKeyTableFull = false;
unsigned short wKeyCtl = 0;
param->u.crypt.err = 0;
/*
if (param_len !=
......@@ -484,7 +470,6 @@ static int hostap_set_encryption(PSDevice pDevice,
if (param->u.crypt.alg > WPA_ALG_CCMP)
return -EINVAL;
if ((param->u.crypt.idx > 3) || (param->u.crypt.key_len > MAX_KEY_LEN)) {
param->u.crypt.err = HOSTAP_CRYPT_ERR_KEY_SET_FAILED;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_KEY_SET_FAILED\n");
......@@ -507,7 +492,6 @@ static int hostap_set_encryption(PSDevice pDevice,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: alg %d \n", param->u.crypt.alg);
if (param->u.crypt.alg == WPA_ALG_NONE) {
if (pMgmt->sNodeDBTable[iNodeIndex].bOnFly == true) {
if (KeybRemoveKey(&(pDevice->sKey),
param->sta_addr,
......@@ -549,7 +533,6 @@ static int hostap_set_encryption(PSDevice pDevice,
}
if (param->u.crypt.alg == WPA_ALG_WEP) {
if ((pDevice->bEnable8021x == false) || (iNodeIndex == 0)) {
KeybSetDefaultKey(&(pDevice->sKey),
dwKeyIndex & ~(BIT30 | USE_KEYRSC),
......@@ -572,7 +555,6 @@ static int hostap_set_encryption(PSDevice pDevice,
KEY_CTL_WEP,
pDevice->PortOffset,
pDevice->byLocalID) == true) {
pMgmt->sNodeDBTable[iNodeIndex].bOnFly = true;
} else {
......@@ -618,7 +600,6 @@ static int hostap_set_encryption(PSDevice pDevice,
pMgmt->byCSSGK = KEY_CTL_CCMP;
}
if (iNodeIndex == 0) {
KeybSetDefaultKey(&(pDevice->sKey),
dwKeyIndex,
......@@ -641,7 +622,6 @@ static int hostap_set_encryption(PSDevice pDevice,
byKeyDecMode,
pDevice->PortOffset,
pDevice->byLocalID) == true) {
pMgmt->sNodeDBTable[iNodeIndex].bOnFly = true;
} else {
......@@ -683,8 +663,6 @@ static int hostap_set_encryption(PSDevice pDevice,
return ret;
}
/*
* Description:
* get each stations encryption key
......@@ -707,7 +685,6 @@ static int hostap_get_encryption(PSDevice pDevice,
int ii;
int iNodeIndex = 0;
param->u.crypt.err = 0;
if (is_broadcast_ether_addr(param->sta_addr)) {
......@@ -728,7 +705,6 @@ static int hostap_get_encryption(PSDevice pDevice,
return ret;
}
/*
* Description:
* vt6655_hostap_ioctl main function supported for hostap deamon.
......@@ -837,7 +813,6 @@ int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
break;
}
if ((ret == 0) && ap_ioctl) {
if (copy_to_user(p->pointer, param, p->length)) {
ret = -EFAULT;
......@@ -850,4 +825,3 @@ int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
return ret;
}
drivers/staging/vt6655/hostap.h
View file @ 96d69e20
......@@ -46,7 +46,6 @@
#define WLAN_RATE_48M BIT10
#define WLAN_RATE_54M BIT11
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......@@ -65,6 +64,3 @@ int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p);
#endif // __HOSTAP_H__
drivers/staging/vt6655/iocmd.h
View file @ 96d69e20
......@@ -37,7 +37,6 @@
//typedef uint16_t u16;
//typedef uint8_t u8;
// ioctl Command code
#define MAGIC_CODE 0x3142
#define IOCTL_CMD_TEST (SIOCDEVPRIVATE + 0)
......@@ -45,9 +44,7 @@
#define IOCTL_CMD_HOSTAPD (SIOCDEVPRIVATE + 2)
#define IOCTL_CMD_WPA (SIOCDEVPRIVATE + 3)
typedef enum tagWMAC_CMD {
WLAN_CMD_BSS_SCAN,
WLAN_CMD_BSS_JOIN,
WLAN_CMD_DISASSOC,
......@@ -68,7 +65,6 @@ typedef enum tagWMAC_CMD {
WLAN_CMD_GET_NODE_CNT,
WLAN_CMD_ZONETYPE_SET,
WLAN_CMD_GET_NODE_LIST
} WMAC_CMD, *PWMAC_CMD;
typedef enum tagWZONETYPE {
......@@ -85,7 +81,6 @@ typedef enum tagWZONETYPE {
#define ADHOC_STARTED 1
#define ADHOC_JOINTED 2
#define PHY80211a 0
#define PHY80211b 1
#define PHY80211g 2
......@@ -115,25 +110,20 @@ typedef struct tagSCmdRequest {
//
typedef struct tagSCmdScan {
u8 ssid[SSID_MAXLEN + 2];
} SCmdScan, *PSCmdScan;
//
// BSS Join
//
typedef struct tagSCmdBSSJoin {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
u32 uChannel;
bool bPSEnable;
bool bShareKeyAuth;
} SCmdBSSJoin, *PSCmdBSSJoin;
//
......@@ -141,10 +131,8 @@ typedef struct tagSCmdBSSJoin {
//
typedef struct tagSCmdZoneTypeSet {
bool bWrite;
WZONETYPE ZoneType;
} SCmdZoneTypeSet, *PSCmdZoneTypeSet;
#ifdef WPA_SM_Transtatus
......@@ -158,7 +146,6 @@ typedef struct tagSWPAResult {
#endif
typedef struct tagSCmdStartAP {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
......@@ -166,24 +153,17 @@ typedef struct tagSCmdStartAP {
u32 uBeaconInt;
bool bShareKeyAuth;
u8 byBasicRate;
} SCmdStartAP, *PSCmdStartAP;
typedef struct tagSCmdSetWEP {
bool bEnableWep;
u8 byKeyIndex;
u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];
bool bWepKeyAvailable[WEP_NKEYS];
u32 auWepKeyLength[WEP_NKEYS];
} SCmdSetWEP, *PSCmdSetWEP;
typedef struct tagSBSSIDItem {
u32 uChannel;
u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 1];
......@@ -197,19 +177,14 @@ typedef struct tagSBSSIDItem {
bool bWEPOn;
u32 uRSSI;
} SBSSIDItem;
typedef struct tagSBSSIDList {
u32 uItem;
SBSSIDItem sBSSIDList[0];
} SBSSIDList, *PSBSSIDList;
typedef struct tagSCmdLinkStatus {
bool bLink;
u16 wBSSType;
u8 byState;
......@@ -217,7 +192,6 @@ typedef struct tagSCmdLinkStatus {
u8 abySSID[SSID_MAXLEN + 2];
u32 uChannel;
u32 uLinkRate;
} SCmdLinkStatus, *PSCmdLinkStatus;
//
......@@ -238,8 +212,6 @@ typedef struct tagSDot11MIBCount {
u32 FCSErrorCount;
} SDot11MIBCount, *PSDot11MIBCount;
//
// statistic counter
//
......@@ -345,7 +317,6 @@ typedef struct tagSStatMIBCount {
u32 ullTxDirectedBytes[2];
} SStatMIBCount, *PSStatMIBCount;
typedef struct tagSNodeItem {
// STA info
u16 wAID;
......@@ -363,31 +334,21 @@ typedef struct tagSNodeItem {
u32 uTxFailures;
u32 uTxAttempts;
u16 wFailureRatio;
} SNodeItem;
typedef struct tagSNodeList {
u32 uItem;
SNodeItem sNodeList[0];
} SNodeList, *PSNodeList;
typedef struct tagSCmdValue {
u32 dwValue;
} SCmdValue, *PSCmdValue;
//
// hostapd & viawget ioctl related
//
// VIAGWET_IOCTL_HOSTAPD ioctl() cmd:
enum {
VIAWGET_HOSTAPD_FLUSH = 1,
......@@ -404,14 +365,11 @@ enum {
VIAWGET_HOSTAPD_STA_CLEAR_STATS = 12,
};
#define VIAWGET_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \
((int)(&((struct viawget_hostapd_param *)0)->u.generic_elem.data))
// Maximum length for algorithm names (-1 for nul termination) used in ioctl()
struct viawget_hostapd_param {
u32 cmd;
u8 sta_addr[6];
......@@ -464,12 +422,8 @@ struct viawget_hostapd_param {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
#endif //__IOCMD_H__
drivers/staging/vt6655/ioctl.h
View file @ 96d69e20
......@@ -33,7 +33,6 @@
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......@@ -52,6 +51,3 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq);
*/
#endif // __IOCTL_H__
drivers/staging/vt6655/iowpa.h
View file @ 96d69e20
......@@ -31,10 +31,8 @@
/*--------------------- Export Definitions -------------------------*/
#define WPA_IE_LEN 64
//WPA related
/*
typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
......@@ -57,7 +55,6 @@ enum {
VIAWGET_SET_DISASSOCIATE = 10
};
enum {
VIAWGET_ASSOC_MSG = 1,
VIAWGET_DISASSOC_MSG = 2,
......@@ -67,8 +64,6 @@ enum {
VIAWGET_DEVICECLOSE_MSG = 6
};
#pragma pack(1)
typedef struct viawget_wpa_header {
u8 type;
......@@ -76,8 +71,6 @@ typedef struct viawget_wpa_header {
u16 resp_ie_len;
} viawget_wpa_header;
struct viawget_wpa_param {
u32 cmd;
u8 addr[6];
......@@ -122,7 +115,6 @@ struct viawget_wpa_param {
} scan_results;
} u;
};
#pragma pack(1)
......@@ -148,12 +140,8 @@ struct viawget_scan_result {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
#endif //__IOWPA_H__
drivers/staging/vt6655/iwctl.c
View file @ 96d69e20
......@@ -64,14 +64,11 @@ static const long frequency_list[] = {
5700, 5745, 5765, 5785, 5805, 5825
};
/*--------------------- Static Classes ----------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Variables --------------------------*/
/*--------------------- Static Functions --------------------------*/
......@@ -105,11 +102,8 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
return &pDevice->wstats;
}
/*------------------------------------------------------------------*/
static int iwctl_commit(struct net_device *dev,
struct iw_request_info *info,
void *wrq,
......@@ -118,7 +112,6 @@ static int iwctl_commit(struct net_device *dev,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT \n");
return 0;
}
/*
* Wireless Handler : get protocol name
......@@ -149,7 +142,6 @@ int iwctl_siwscan(struct net_device *dev,
PWLAN_IE_SSID pItemSSID = NULL;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSCAN \n");
if (pDevice->byReAssocCount > 0) { //reject scan when re-associating!
//send scan event to wpa_Supplicant
union iwreq_data wrqu;
......@@ -195,7 +187,6 @@ int iwctl_siwscan(struct net_device *dev,
return 0;
}
/*
* Wireless Handler : get scan results
*/
......@@ -218,7 +209,6 @@ int iwctl_giwscan(struct net_device *dev,
long ldBm;
char buf[MAX_WPA_IE_LEN * 2 + 30];
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n");
if (pMgmt->eScanState == WMAC_IS_SCANNING) {
......@@ -348,10 +338,8 @@ int iwctl_giwscan(struct net_device *dev,
wrq->length = current_ev - extra;
return 0;
}
/*
* Wireless Handler : set frequency or channel
*/
......@@ -449,7 +437,6 @@ int iwctl_siwmode(struct net_device *dev,
}
switch (*wmode) {
case IW_MODE_ADHOC:
if (pMgmt->eConfigMode != WMAC_CONFIG_IBSS_STA) {
pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;
......@@ -507,7 +494,6 @@ int iwctl_giwmode(struct net_device *dev,
PSDevice pDevice = (PSDevice)netdev_priv(dev);
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE \n");
// If not managed, assume it's ad-hoc
switch (pMgmt->eConfigMode) {
......@@ -530,7 +516,6 @@ int iwctl_giwmode(struct net_device *dev,
return 0;
}
/*
* Wireless Handler : get capability range
*/
......@@ -544,7 +529,6 @@ int iwctl_giwrange(struct net_device *dev,
int i, k;
unsigned char abySupportedRates[13] = {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE \n");
if (wrq->pointer) {
wrq->length = sizeof(struct iw_range);
......@@ -591,7 +575,6 @@ int iwctl_giwrange(struct net_device *dev,
range->min_frag = 256;
range->max_frag = 2312;
// the encoding capabilities
range->num_encoding_sizes = 3;
// 64(40) bits WEP
......@@ -636,11 +619,9 @@ int iwctl_giwrange(struct net_device *dev,
range->avg_qual.noise = 0;
}
return 0;
}
/*
* Wireless Handler : set ap mac address
*/
......@@ -711,7 +692,6 @@ int iwctl_giwap(struct net_device *dev,
PSDevice pDevice = (PSDevice)netdev_priv(dev);
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP \n");
memcpy(wrq->sa_data, pMgmt->abyCurrBSSID, 6);
......@@ -726,10 +706,8 @@ int iwctl_giwap(struct net_device *dev,
wrq->sa_family = ARPHRD_ETHER;
return 0;
}
/*
* Wireless Handler : get ap list
*/
......@@ -745,7 +723,6 @@ int iwctl_giwaplist(struct net_device *dev,
PSDevice pDevice = (PSDevice)netdev_priv(dev);
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAPLIST \n");
// Only super-user can see AP list
......@@ -755,7 +732,6 @@ int iwctl_giwaplist(struct net_device *dev,
}
if (wrq->pointer) {
PKnownBSS pBSS = &(pMgmt->sBSSList[0]);
for (ii = 0, jj = 0; ii < MAX_BSS_NUM; ii++) {
......@@ -781,7 +757,6 @@ int iwctl_giwaplist(struct net_device *dev,
return rc;
}
/*
* Wireless Handler : set essid
*/
......@@ -797,7 +772,6 @@ int iwctl_siwessid(struct net_device *dev,
//2008-0409-05, <Add> by Einsn Liu
unsigned char len;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWESSID \n");
pDevice->fWPA_Authened = false;
if (pMgmt->eScanState == WMAC_IS_SCANNING) {
......@@ -890,11 +864,9 @@ int iwctl_siwessid(struct net_device *dev,
pDevice->bCommit = true;
}
return 0;
}
/*
* Wireless Handler : get essid
*/
......@@ -904,7 +876,6 @@ int iwctl_giwessid(struct net_device *dev,
struct iw_point *wrq,
char *extra)
{
PSDevice pDevice = (PSDevice)netdev_priv(dev);
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PWLAN_IE_SSID pItemSSID;
......@@ -924,7 +895,6 @@ int iwctl_giwessid(struct net_device *dev,
wrq->length = pItemSSID->len;
wrq->flags = 1; // active
return 0;
}
......@@ -943,7 +913,6 @@ int iwctl_siwrate(struct net_device *dev,
int i;
unsigned char abySupportedRates[13] = {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRATE \n");
if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
rc = -EINVAL;
......@@ -1042,7 +1011,6 @@ int iwctl_giwrate(struct net_device *dev,
brate = 0x6C;
}
} else {
brate = abySupportedRates[TxRate_iwconfig];
}
} else brate = 0;
......@@ -1067,12 +1035,9 @@ int iwctl_giwrate(struct net_device *dev,
wrq->fixed = true;
}
return 0;
}
/*
* Wireless Handler : set rts threshold
*/
......@@ -1133,10 +1098,8 @@ int iwctl_siwfrag(struct net_device *dev,
int rc = 0;
int fthr = wrq->value;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFRAG \n");
if (wrq->disabled)
fthr = 2312;
if ((fthr < 256) || (fthr > 2312)) {
......@@ -1168,8 +1131,6 @@ int iwctl_giwfrag(struct net_device *dev,
return 0;
}
/*
* Wireless Handler : set retry threshold
*/
......@@ -1181,7 +1142,6 @@ int iwctl_siwretry(struct net_device *dev,
PSDevice pDevice = (PSDevice)netdev_priv(dev);
int rc = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRETRY \n");
if (wrq->disabled) {
......@@ -1204,7 +1164,6 @@ int iwctl_siwretry(struct net_device *dev,
pDevice->wMaxTransmitMSDULifetime = wrq->value;
}
return rc;
}
......@@ -1234,11 +1193,9 @@ int iwctl_giwretry(struct net_device *dev,
wrq->flags |= IW_RETRY_MIN;
}
return 0;
}
/*
* Wireless Handler : set encode mode
*/
......@@ -1280,7 +1237,6 @@ int iwctl_siwencode(struct net_device *dev,
} else dwKeyIndex = 0;
} else dwKeyIndex--;
// Check the size of the key
if (wrq->length > WLAN_WEP232_KEYLEN) {
rc = -EINVAL;
......@@ -1380,7 +1336,6 @@ int iwctl_siwencode(struct net_device *dev,
// Send the key to the card
if (wrq->length > 0) {
if (wrq->length == WLAN_WEP232_KEYLEN) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n");
} else if (wrq->length == WLAN_WEP104_KEYLEN) {
......@@ -1425,7 +1380,6 @@ int iwctl_siwencode(struct net_device *dev,
}
// Read the flags
if (wrq->flags & IW_ENCODE_DISABLED) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n");
pMgmt->bShareKeyAlgorithm = false;
pDevice->bEncryptionEnable = false;
......@@ -1513,7 +1467,6 @@ memcpy(extra, abyKey, WLAN_WEP232_KEYLEN);
// return rc;
// }
//End Modify,Einsn
return 0;
......@@ -1580,7 +1533,6 @@ int iwctl_giwencode(struct net_device *dev,
return 0;
}
/*
* Wireless Handler : set power mode
*/
......@@ -1643,10 +1595,8 @@ int iwctl_giwpower(struct net_device *dev,
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
int mode = pDevice->ePSMode;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPOWER \n");
wrq->disabled = (mode == WMAC_POWER_CAM);
if (wrq->disabled)
return 0;
......@@ -1663,7 +1613,6 @@ int iwctl_giwpower(struct net_device *dev,
return 0;
}
/*
* Wireless Handler : get Sensitivity
*/
......@@ -1685,7 +1634,6 @@ int iwctl_giwsens(struct net_device *dev,
wrq->disabled = (wrq->value == 0);
wrq->fixed = 1;
return 0;
}
......@@ -1803,7 +1751,6 @@ int iwctl_siwauth(struct net_device *dev,
return ret;
}
int iwctl_giwauth(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
......@@ -1812,8 +1759,6 @@ int iwctl_giwauth(struct net_device *dev,
return -EOPNOTSUPP;
}
int iwctl_siwgenie(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *wrq,
......@@ -1871,7 +1816,6 @@ int iwctl_giwgenie(struct net_device *dev,
return ret;
}
int iwctl_siwencodeext(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *wrq,
......@@ -1992,8 +1936,6 @@ int iwctl_siwencodeext(struct net_device *dev,
return ret;
}
int iwctl_giwencodeext(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *wrq,
......@@ -2036,18 +1978,15 @@ int iwctl_siwmlme(struct net_device *dev,
}
return ret;
}
#endif
/*------------------------------------------------------------------*/
/*
* Structures to export the Wireless Handlers
*/
/*
static const iw_handler iwctl_handler[] =
{
......@@ -2173,21 +2112,17 @@ static const iw_handler iwctl_handler[] =
(iw_handler) NULL, // -- hole --
};
static const iw_handler iwctl_private_handler[] =
{
NULL, // SIOCIWFIRSTPRIV
};
struct iw_priv_args iwctl_private_args[] = {
{ IOCTL_CMD_SET,
IW_PRIV_TYPE_CHAR | 1024, 0,
"set"},
};
const struct iw_handler_def iwctl_handler_def =
{
.get_wireless_stats = &iwctl_get_wireless_stats,
......
drivers/staging/vt6655/iwctl.h
View file @ 96d69e20
......@@ -33,7 +33,6 @@
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......@@ -42,7 +41,6 @@
struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev);
int iwctl_siwap(struct net_device *dev,
struct iw_request_info *info,
struct sockaddr *wrq,
......@@ -53,7 +51,6 @@ int iwctl_giwrange(struct net_device *dev,
struct iw_point *wrq,
char *extra);
int iwctl_giwmode(struct net_device *dev,
struct iw_request_info *info,
__u32 *wmode,
......@@ -119,7 +116,6 @@ int iwctl_siwrts(struct net_device *dev,
struct iw_param *wrq,
char *extra);
int iwctl_giwrts(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
......@@ -214,11 +210,7 @@ int iwctl_siwmlme(struct net_device *dev,
#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//End Add -- //2008-0409-07, <Add> by Einsn Liu
extern const struct iw_handler_def iwctl_handler_def;
extern const struct iw_priv_args iwctl_private_args;
#endif // __IWCTL_H__
drivers/staging/vt6655/key.c
View file @ 96d69e20
......@@ -71,7 +71,6 @@ s_vCheckKeyTableValid(PSKeyManagement pTable, unsigned long dwIoBase)
(pTable->KeyTable[i].GroupKey[2].bKeyValid == false) &&
(pTable->KeyTable[i].GroupKey[3].bKeyValid == false)
) {
pTable->KeyTable[i].bInUse = false;
pTable->KeyTable[i].wKeyCtl = 0;
pTable->KeyTable[i].bSoftWEP = false;
......@@ -80,10 +79,8 @@ s_vCheckKeyTableValid(PSKeyManagement pTable, unsigned long dwIoBase)
}
}
/*--------------------- Export Functions --------------------------*/
/*
* Description: Init Key management table
*
......@@ -116,7 +113,6 @@ void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase)
}
}
/*
* Description: Get Key from table
*
......@@ -168,7 +164,6 @@ bool KeybGetKey(
return false;
}
/*
* Description: Set Key to table
*
......@@ -342,7 +337,6 @@ bool KeybSetKey(
return false;
}
/*
* Description: Remove Key from table
*
......@@ -412,7 +406,6 @@ bool KeybRemoveKey(
return false;
}
/*
* Description: Remove Key from table
*
......@@ -467,7 +460,6 @@ void KeyvRemoveWEPKey(
unsigned long dwIoBase
)
{
if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == true) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].byCipherSuite == KEY_CTL_WEP) {
......@@ -521,9 +513,7 @@ bool KeybGetTransmitKey(
for (i = 0; i < MAX_KEY_TABLE; i++) {
if ((pTable->KeyTable[i].bInUse == true) &&
!compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
if (dwKeyType == PAIRWISE_KEY) {
if (pTable->KeyTable[i].PairwiseKey.bKeyValid == true) {
*pKey = &(pTable->KeyTable[i].PairwiseKey);
......@@ -534,7 +524,6 @@ bool KeybGetTransmitKey(
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\n");
return true;
} else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PairwiseKey.bKeyValid == false\n");
......@@ -573,7 +562,6 @@ bool KeybGetTransmitKey(
return false;
}
/*
* Description: Check Pairewise Key
*
......@@ -637,7 +625,6 @@ bool KeybSetDefaultKey(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength);
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
return false;
} else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) {
......@@ -696,7 +683,6 @@ bool KeybSetDefaultKey(
pKey->dwTSC47_16 = 0;
pKey->wTSC15_0 = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybSetKey(R): \n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey->bKeyValid: %d\n", pKey->bKeyValid);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey->uKeyLength: %d\n", (int)pKey->uKeyLength);
......@@ -713,7 +699,6 @@ bool KeybSetDefaultKey(
return true;
}
/*
* Description: Set Key to table
*
......@@ -748,7 +733,6 @@ bool KeybSetAllGroupKey(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
return false;
} else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) {
......
drivers/staging/vt6655/key.h
View file @ 96d69e20
......@@ -40,7 +40,6 @@
#define MAX_KEY_LEN 32
#define AES_KEY_LEN 16
#define AUTHENTICATOR_KEY 0x10000000
#define USE_KEYRSC 0x20000000
#define PAIRWISE_KEY 0x40000000
......@@ -54,7 +53,6 @@
#define KEY_CTL_CCMP 0x03
#define KEY_CTL_INVALID 0xFF
typedef struct tagSKeyItem
{
bool bKeyValid;
......@@ -181,4 +179,3 @@ bool KeybSetAllGroupKey(
);
#endif // __KEY_H__
drivers/staging/vt6655/mac.c
View file @ 96d69e20
......@@ -86,10 +86,6 @@ static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Export Functions --------------------------*/
/*
* Description:
* Read All MAC Registers to buffer
......@@ -122,7 +118,6 @@ void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs)
}
MACvSelectPage0(dwIoBase);
}
/*
......@@ -608,7 +603,6 @@ void MACvSetPacketFilter(unsigned long dwIoBase, unsigned short wFilterType)
}
if (wFilterType & PKT_TYPE_PROMISCUOUS) {
byNewRCR |= (RCR_RXALLTYPE | RCR_UNICAST | RCR_MULTICAST | RCR_BROADCAST);
byNewRCR &= ~RCR_BSSID;
......@@ -707,11 +701,9 @@ void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf)
VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR));
VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_BCNDMAPTR));
VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0));
VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1));
}
/*
......@@ -756,7 +748,6 @@ bool MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf)
return false;
}
return true;
}
......@@ -790,7 +781,6 @@ bool MACbSoftwareReset(unsigned long dwIoBase)
if (ww == W_MAX_TIMEOUT)
return false;
return true;
}
/*
......@@ -912,7 +902,6 @@ bool MACbSafeTxOff(unsigned long dwIoBase)
//AC0
VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_CLRRUN);
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0, &dwData);
if (!(dwData & DMACTL_RUN))
......@@ -1047,12 +1036,10 @@ void MACvInitialize(unsigned long dwIoBase)
// enable TSF counter
VNSvOutPortB(dwIoBase + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
// set packet filter
// receive directed and broadcast address
MACvSetPacketFilter(dwIoBase, PKT_TYPE_DIRECTED | PKT_TYPE_BROADCAST);
}
/*
......@@ -1209,8 +1196,6 @@ void MACvSetCurrAC0DescAddrEx(unsigned long dwIoBase, unsigned long dwCurrDescAd
}
}
void MACvSetCurrTXDescAddr(int iTxType, unsigned long dwIoBase, unsigned long dwCurrDescAddr)
{
if (iTxType == TYPE_AC0DMA) {
......@@ -1253,7 +1238,6 @@ void MACvTimer0MicroSDelay(unsigned long dwIoBase, unsigned int uDelay)
}
}
VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0);
}
/*
......@@ -1298,7 +1282,6 @@ void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime)
VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, (TMCTL_TMD | TMCTL_TE));
}
void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData)
{
if (wOffset > 273)
......@@ -1308,7 +1291,6 @@ void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned lo
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
}
bool MACbTxDMAOff(unsigned long dwIoBase, unsigned int idx)
{
unsigned char byData;
......@@ -1455,7 +1437,6 @@ void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned in
if (byLocalID <= 1)
return;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MACvSetKeyEntry\n");
wOffset = MISCFIFO_KEYETRY0;
wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
......@@ -1496,8 +1477,6 @@ void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned in
}
}
/*
* Description:
* Disable the Key Entry by MISCFIFO
......@@ -1524,7 +1503,6 @@ void MACvDisableKeyEntry(unsigned long dwIoBase, unsigned int uEntryIdx)
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
}
/*
* Description:
* Set the default Key (KeyEntry[10]) by MISCFIFO
......@@ -1572,10 +1550,8 @@ void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "End. wOffset: %d, Data: %lX\n", wOffset+3, dwData);
}
/*
* Description:
* Enable default Key (KeyEntry[10]) by MISCFIFO
......@@ -1596,7 +1572,6 @@ void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
unsigned short wOffset;
unsigned long dwData;
if (byLocalID <= 1)
return;
......@@ -1631,7 +1606,6 @@ void MACvDisableDefaultKey(unsigned long dwIoBase)
unsigned short wOffset;
unsigned long dwData;
wOffset = MISCFIFO_KEYETRY0;
wOffset += (10 * MISCFIFO_KEYENTRYSIZE);
......@@ -1666,7 +1640,6 @@ void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
if (byLocalID <= 1)
return;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MACvSetDefaultTKIPKeyEntry\n");
wOffset = MISCFIFO_KEYETRY0;
// Kyle test : change offset from 10 -> 0
......@@ -1693,11 +1666,8 @@ void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++);
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
}
}
/*
* Description:
* Set the Key Control by MISCFIFO
......@@ -1721,7 +1691,6 @@ void MACvSetDefaultKeyCtl(unsigned long dwIoBase, unsigned short wKeyCtl, unsign
if (byLocalID <= 1)
return;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MACvSetKeyEntry\n");
wOffset = MISCFIFO_KEYETRY0;
wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
......@@ -1735,6 +1704,4 @@ void MACvSetDefaultKeyCtl(unsigned long dwIoBase, unsigned short wKeyCtl, unsign
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
}
drivers/staging/vt6655/mac.h
View file @ 96d69e20
......@@ -197,7 +197,6 @@
#define MAC_REG_PWRCCK 0x73
#define MAC_REG_PWROFDM 0x7C
//
// Bits in the BCFG0 register
//
......@@ -398,7 +397,6 @@
#define IMR_AC0DMA 0x00000002 //
#define IMR_TXDMA0 0x00000001 //
//
// Bits in the ISR register
//
......@@ -422,7 +420,6 @@
#define ISR_AC0DMA 0x00000002 //
#define ISR_TXDMA0 0x00000001 //
//
// Bits in the PSCFG register
//
......@@ -513,7 +510,6 @@
//
#define MISCFFCTL_WRITE 0x0001 //
//
// Bits in WAKEUPEN0
//
......@@ -557,7 +553,6 @@
#define GPIO1_MD 0x10 //
#define GPIO1_DATA 0x20 //
//
// Bits in the MSRCTL register
//
......@@ -576,7 +571,6 @@
#define MSRCTL1_CSAPAREN 0x04
#define MSRCTL1_TXPAUSE 0x01
// Loopback mode
#define MAC_LB_EXT 0x02 //
#define MAC_LB_INTERNAL 0x01 //
......@@ -595,7 +589,6 @@
#define Default_BI 0x200
// MiscFIFO Offset
#define MISCFIFO_KEYETRY0 32
#define MISCFIFO_KEYENTRYSIZE 22
......@@ -1056,4 +1049,3 @@ void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
void MACvSetDefaultKeyCtl(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, unsigned char byLocalID);
#endif // __MAC_H__
drivers/staging/vt6655/mib.c
View file @ 96d69e20
......@@ -56,8 +56,6 @@ static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Export Functions --------------------------*/
/*
* Description: Clear All Statistic Counter
*
......@@ -76,7 +74,6 @@ void STAvClearAllCounter(PSStatCounter pStatistic)
memset(pStatistic, 0, sizeof(SStatCounter));
}
/*
* Description: Update Isr Statistic Counter
*
......@@ -141,10 +138,8 @@ void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr)
if (dwIsr & ISR_SOFTTIMER1) // ISR, bit21
pStatistic->ISRStat.dwIsrSTIMER1Int++;
}
/*
* Description: Update Rx Statistic Counter
*
......@@ -293,7 +288,6 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
pStatistic->dwRsrRxPacket++;
pStatistic->dwRsrRxOctet += cbFrameLength;
if (IS_TYPE_DATA(pbyBuffer)) {
pStatistic->dwRsrRxData++;
} else if (IS_TYPE_MGMT(pbyBuffer)) {
......@@ -329,11 +323,8 @@ void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
} else if (cbFrameLength > ETH_FRAME_LEN + 4) {
pStatistic->dwRsrLong++;
}
}
/*
* Description: Update Rx Statistic Counter and copy Rx buffer
*
......@@ -376,7 +367,6 @@ STAvUpdateRDStatCounterEx(
memcpy(pStatistic->abyCntRxPattern, (unsigned char *)pbyBuffer, 10);
}
/*
* Description: Update Tx Statistic Counter
*
......@@ -408,8 +398,6 @@ STAvUpdateTDStatCounter(
unsigned char *pbyDestAddr;
unsigned char byTSR0_NCR = byTSR0 & TSR0_NCR;
pHeader = (PWLAN_80211HDR_A4) pbyBuffer;
if (WLAN_GET_FC_TODS(pHeader->wFrameCtl) == 0) {
pbyDestAddr = &(pHeader->abyAddr1[0]);
......@@ -462,10 +450,8 @@ STAvUpdateTDStatCounter(
pStatistic->dwTsrMulticast[uIdx]++;
else
pStatistic->dwTsrDirected[uIdx]++;
}
/*
* Description: Update Tx Statistic Counter and copy Tx buffer
*
......@@ -497,7 +483,6 @@ STAvUpdateTDStatCounterEx(
memcpy(pStatistic->abyCntTxPattern, pbyBuffer, 16);
}
/*
* Description: Update 802.11 mib counter
*
......
drivers/staging/vt6655/mib.h
View file @ 96d69e20
......@@ -67,7 +67,6 @@ typedef struct tagSDot11Counters {
// unsigned long long DecryptFailureCount;
} SDot11Counters, *PSDot11Counters;
//
// MIB2 counter
//
......@@ -105,7 +104,6 @@ typedef struct tagSMib2Counter {
#define DOWN 2 //
#define TESTING 3 //
//
// RMON counter
//
......@@ -168,10 +166,8 @@ typedef struct tagSCustomCounters {
unsigned long long ullRsr12MCRCOk;
unsigned long long ullRsr9MCRCOk;
unsigned long long ullRsr6MCRCOk;
} SCustomCounters, *PSCustomCounters;
//
// Custom counter
//
......@@ -202,7 +198,6 @@ typedef struct tagSISRCounters {
/////////////////////////////////////
} SISRCounters, *PSISRCounters;
// Value in the etherStatsStatus entry
#define VALID 1 //
#define CREATE_REQUEST 2 //
......@@ -217,7 +212,6 @@ typedef struct tagSStatCounter {
// ISR status count
//
// RSR status count
//
unsigned long dwRsrFrmAlgnErr;
......@@ -293,8 +287,6 @@ typedef struct tagSStatCounter {
unsigned char abyCntRxPattern[16];
unsigned char abyCntTxPattern[16];
// Software check....
unsigned long dwCntRxDataErr; // rx buffer data software compare CRC err count
unsigned long dwCntDecryptErr; // rx buffer data software compare CRC err count
......@@ -370,6 +362,3 @@ void STAvUpdate802_11Counter(
void STAvClear802_11Counter(PSDot11Counters p802_11Counter);
#endif // __MIB_H__
drivers/staging/vt6655/michael.c
View file @ 96d69e20
......@@ -135,7 +135,6 @@ void MIC_vInit(unsigned long dwK0, unsigned long dwK1)
s_vSetKey(dwK0, dwK1);
}
void MIC_vUnInit(void)
{
// Wipe the key material
......@@ -174,4 +173,3 @@ void MIC_vGetMIC(unsigned long *pdwL, unsigned long *pdwR)
// Reset to the empty message.
s_vClear();
}
drivers/staging/vt6655/michael.h
View file @ 96d69e20
......@@ -54,5 +54,3 @@ void MIC_vGetMIC(unsigned long *pdwL, unsigned long *pdwR);
#define ROR32(A, n) ROL32((A), 32-(n))
#endif //__MICHAEL_H__
drivers/staging/vt6655/power.c
View file @ 96d69e20
......@@ -48,19 +48,14 @@
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/
static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
/*+
......@@ -73,7 +68,6 @@ static int msglevel = MSG_LEVEL_INFO;
*
-*/
void
PSvEnablePowerSaving(
void *hDeviceContext,
......@@ -128,11 +122,6 @@ PSvEnablePowerSaving(
return;
}
/*+
*
* Routine Description:
......@@ -169,7 +158,6 @@ PSvDisablePowerSaving(
return;
}
/*+
*
* Routine Description:
......@@ -180,7 +168,6 @@ PSvDisablePowerSaving(
* false, if fail
-*/
bool
PSbConsiderPowerDown(
void *hDeviceContext,
......@@ -235,8 +222,6 @@ PSbConsiderPowerDown(
return true;
}
/*+
*
* Routine Description:
......@@ -247,8 +232,6 @@ PSbConsiderPowerDown(
*
-*/
void
PSvSendPSPOLL(
void *hDeviceContext
......@@ -258,7 +241,6 @@ PSvSendPSPOLL(
PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxMgmtPacket pTxPacket = NULL;
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_HDR_ADDR2_LEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
......@@ -283,8 +265,6 @@ PSvSendPSPOLL(
return;
}
/*+
*
* Routine Description:
......@@ -304,7 +284,6 @@ PSbSendNullPacket(
PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uIdx;
if (pDevice->bLinkPass == false) {
return false;
}
......@@ -330,7 +309,6 @@ PSbSendNullPacket(
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
if (pDevice->bEnablePSMode) {
pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
......@@ -360,11 +338,9 @@ PSbSendNullPacket(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");
return false;
} else {
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n");
}
return true;
}
......@@ -383,7 +359,6 @@ PSbIsNextTBTTWakeUp(
void *hDeviceContext
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
bool bWakeUp = false;
......@@ -405,4 +380,3 @@ PSbIsNextTBTTWakeUp(
return bWakeUp;
}
drivers/staging/vt6655/power.h
View file @ 96d69e20
......@@ -29,7 +29,6 @@
#ifndef __POWER_H__
#define __POWER_H__
/*--------------------- Export Definitions -------------------------*/
#define C_PWBT 1000 // micro sec. power up before TBTT
#define PS_FAST_INTERVAL 1 // Fast power saving listen interval
......@@ -39,10 +38,8 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
// PSDevice pDevice
......
drivers/staging/vt6655/rf.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/rf.h
View file @ 96d69e20
......@@ -68,7 +68,6 @@
#define CB_MAXIM2829_CHANNEL_5G_HIGH 41 //Index41: channel = 100, Tf = 5500MHz, set the (A3:A0=0101) D6=1
#define CB_UW2452_CHANNEL_5G_HIGH 41 //[20041210] Index41: channel = 100, Tf = 5500MHz, change VCO2->VCO3
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
......@@ -100,6 +99,3 @@ bool RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, unsigned char byO
//}} RobertYu
#endif // __RF_H__
drivers/staging/vt6655/rxtx.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/rxtx.h
View file @ 96d69e20
......@@ -50,7 +50,6 @@
bool bIsWEP, unsigned int *pcbHeadSize);
*/
void
vGenerateMACHeader(
PSDevice pDevice,
......@@ -63,7 +62,6 @@ vGenerateMACHeader(
unsigned int uFragIdx
);
unsigned int
cbGetFragCount(
PSDevice pDevice,
......@@ -72,14 +70,12 @@ cbGetFragCount(
PSEthernetHeader psEthHeader
);
void
vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr,
bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey,
unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize);
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen);
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
......
drivers/staging/vt6655/srom.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/srom.h
View file @ 96d69e20
......@@ -69,7 +69,6 @@
//}}
#define EEP_OFS_OFDMA_PWR_dBm 0xD2
//----------need to remove --------------------
#define EEP_OFS_BBTAB_LEN 0x70 // BB Table Length
#define EEP_OFS_BBTAB_ADR 0x71 // BB Table Offset
......@@ -77,7 +76,6 @@
#define EEP_I2C_DEV_ID 0x50 // EEPROM device address on the I2C bus
//
// Bits in EEP_OFS_ANTENNA
//
......
drivers/staging/vt6655/tcrc.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/tcrc.h
View file @ 96d69e20
......@@ -48,6 +48,3 @@ unsigned long CRCdwGetCrc32(unsigned char *pbyData, unsigned int cbByte);
unsigned long CRCdwGetCrc32Ex(unsigned char *pbyData, unsigned int cbByte, unsigned long dwPreCRC);
#endif // __TCRC_H__
drivers/staging/vt6655/tether.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/tether.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/tkip.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/tkip.h
View file @ 96d69e20
......@@ -55,6 +55,3 @@ void TKIPvMixKey(
);
#endif // __TKIP_H__
drivers/staging/vt6655/tmacro.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/ttype.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/upc.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/vntwifi.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/vntwifi.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wcmd.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wcmd.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wctl.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wctl.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wmgr.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wmgr.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpa.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpa.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpa2.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpa2.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpactl.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wpactl.h
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wroute.c
View file @ 96d69e20
This diff is collapsed.
drivers/staging/vt6655/wroute.h
View file @ 96d69e20
......@@ -42,6 +42,3 @@
bool ROUTEbRelay(PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
#endif // __WROUTE_H__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7