Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 354523
b: refs/heads/master
c: dfdcc42
h: refs/heads/master
i:
  354521: 75c96bf
  354519: bdf9b60
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent 9ff2231 commit 8809a86
Show file tree
Hide file tree
Showing 26 changed files with 77 additions and 79 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6592810e4d9493781c187e482ab0fd5cc97893f
refs/heads/master: dfdcc425975d06cbfcc9b5c0fad2f3af5476cd05
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/aes_ccmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ void AESv128(BYTE *key, BYTE *data, BYTE *ciphertext)
*
*/

BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
{
BYTE abyNonce[13];
BYTE MIC_IV[16];
Expand All @@ -249,7 +249,7 @@ BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
WORD wHLen = 22;
/* 8 is IV, 8 is MIC, 4 is CRC */
WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;
BOOL bA4 = FALSE;
bool bA4 = FALSE;
BYTE byTmp;
WORD wCnt;
int ii, jj, kk;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/aes_ccmp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
/*--------------------- Export Variables --------------------------*/

/*--------------------- Export Functions --------------------------*/
BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);
bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);

#endif /* __AES_CCMP_H__ */
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/bssdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
(struct vnt_rx_mgmt *)pRxPacketContext;
PKnownBSS pBSSList = NULL;
unsigned int ii;
BOOL bParsingQuiet = FALSE;
bool bParsingQuiet = FALSE;


pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);
Expand Down Expand Up @@ -453,7 +453,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == TRUE)) {

PSKeyItem pTransmitKey = NULL;
BOOL bIs802_1x = FALSE;
bool bIs802_1x = FALSE;

for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) {
if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) {
Expand Down Expand Up @@ -534,7 +534,7 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice,
(struct vnt_rx_mgmt *)pRxPacketContext;
int ii, jj;
signed long ldBm, ldBmSum;
BOOL bParsingQuiet = FALSE;
bool bParsingQuiet = FALSE;

if (pBSSList == NULL)
return FALSE;
Expand Down
28 changes: 14 additions & 14 deletions trunk/drivers/staging/vt6656/bssdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@
//

typedef struct tagSERPObject {
BOOL bERPExist;
bool bERPExist;
BYTE byERP;
} ERPObject, *PERPObject;


typedef struct tagSRSNCapObject {
BOOL bRSNCapExist;
bool bRSNCapExist;
WORD wRSNCap;
} SRSNCapObject, *PSRSNCapObject;

// BSS info(AP)
typedef struct tagKnownBSS {
// BSS info
BOOL bActive;
bool bActive;
BYTE abyBSSID[WLAN_BSSID_LEN];
unsigned int uChannel;
BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
Expand All @@ -110,10 +110,10 @@ typedef struct tagKnownBSS {
signed long ldBmAverage[RSSI_STAT_COUNT];
signed long ldBmAverRange;
//For any BSSID selection improvment
BOOL bSelected;
bool bSelected;

//++ WPA informations
BOOL bWPAValid;
bool bWPAValid;
BYTE byGKType;
BYTE abyPKType[4];
WORD wPKCount;
Expand All @@ -124,7 +124,7 @@ typedef struct tagKnownBSS {
//--

//++ WPA2 informations
BOOL bWPA2Valid;
bool bWPA2Valid;
BYTE byCSSGK;
WORD wCSSPKCount;
BYTE abyCSSPK[4];
Expand Down Expand Up @@ -167,14 +167,14 @@ typedef enum tagNODE_STATE {
// STA node info
typedef struct tagKnownNodeDB {
// STA info
BOOL bActive;
bool bActive;
BYTE abyMACAddr[WLAN_ADDR_LEN];
BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
WORD wTxDataRate;
BOOL bShortPreamble;
BOOL bERPExist;
BOOL bShortSlotTime;
bool bShortPreamble;
bool bERPExist;
bool bShortSlotTime;
unsigned int uInActiveCount;
WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp.
WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.
Expand All @@ -188,15 +188,15 @@ typedef struct tagKnownNodeDB {
WORD wListenInterval;
WORD wAID;
NODE_STATE eNodeState;
BOOL bPSEnable;
BOOL bRxPSPoll;
bool bPSEnable;
bool bRxPSPoll;
BYTE byAuthSequence;
unsigned long ulLastRxJiffer;
BYTE bySuppRate;
DWORD dwFlags;
WORD wEnQueueCnt;

BOOL bOnFly;
bool bOnFly;
unsigned long long KeyRSC;
BYTE byKeyIndex;
DWORD dwKeyIndex;
Expand All @@ -207,7 +207,7 @@ typedef struct tagKnownNodeDB {
BYTE abyWepKey[WLAN_WEPMAX_KEYLEN];
//
// Auto rate fallback vars
BOOL bIsInFallback;
bool bIsInFallback;
unsigned int uAverageRSSI;
unsigned int uRateRecoveryTimeout;
unsigned int uRatePollTimeout;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/card.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
}
else {// PK_TYPE_11GA & PK_TYPE_11GB
BYTE byRate = 0;
BOOL bOFDMRate = FALSE;
bool bOFDMRate = FALSE;
unsigned int ii = 0;
PWLAN_IE_SUPP_RATES pItemRates = NULL;

Expand Down Expand Up @@ -726,7 +726,7 @@ void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
* Return Value: TRUE if success; otherwise FALSE
*
*/
int CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)
bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)
{

*pqwCurrTSF = pDevice->qwCurrTSF;
Expand All @@ -746,7 +746,7 @@ int CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)
* Return Value: TRUE if success; otherwise FALSE
*
*/
int CARDbClearCurrentTSF(struct vnt_private *pDevice)
bool CARDbClearCurrentTSF(struct vnt_private *pDevice)
{

MACvRegBitsOn(pDevice, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/card.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ void CARDbAddBasicRate(struct vnt_private *pDevice, u16 wRateIdx);
int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice);
void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
u64 qwBSSTimestamp, u64 qwLocalTSF);
BOOL CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF);
BOOL CARDbClearCurrentTSF(struct vnt_private *pDevice);
bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF);
bool CARDbClearCurrentTSF(struct vnt_private *pDevice);
void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,
WORD wBeaconInterval);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ static struct
// 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
// 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56)
************************************************************************/
BOOL
bool
ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
{
BOOL bValid;
bool bValid;

bValid = FALSE;
/*
Expand Down Expand Up @@ -422,7 +422,7 @@ ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
* 0x0000000000000003 means channel 1,2 are supported
* 0x000000000000000F means channel 1,2,..15 are supported
************************************************************************/
BOOL
bool
CHvChannelGetList (
unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
typedef struct tagSChannelTblElement {
BYTE byChannelNumber;
unsigned int uFrequency;
BOOL bValid;
bool bValid;
} SChannelTblElement, *PSChannelTblElement;

/*--------------------- Export Variables --------------------------*/

/*--------------------- Export Functions --------------------------*/

BOOL ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
bool ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
void CHvInitChannelTable(struct vnt_private *pDevice);
BYTE CHbyGetChannelMapping(BYTE byChannelNumber);

BOOL CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);
bool CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);

#endif /* _CHANNEL_H_ */
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vt6656/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ typedef struct _USB_SEND_CONTEXT {
CONTEXT_TYPE Type;
SEthernetHeader sEthHeader;
void *Next;
BOOL bBoolInUse;
bool bBoolInUse;
unsigned char Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS];
} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;

Expand All @@ -214,7 +214,7 @@ typedef struct {
unsigned int uDataLen;
PBYTE pDataBuf;
/* struct urb *pUrb; */
BOOL bInUse;
bool bInUse;
} INT_BUFFER, *PINT_BUFFER;

/* 0:11A 1:11B 2:11G */
Expand Down Expand Up @@ -308,7 +308,7 @@ typedef struct tagSPMKIDCandidateEvent {
#define MAX_QUIET_COUNT 8

typedef struct tagSQuietControl {
BOOL bEnable;
bool bEnable;
DWORD dwStartTime;
BYTE byPeriod;
WORD wDuration;
Expand Down Expand Up @@ -342,7 +342,7 @@ typedef struct tagSDeFragControlBlock
struct sk_buff* skb;
PBYTE pbyRxBuffer;
unsigned int cbFrameLength;
BOOL bInUse;
bool bInUse;
} SDeFragControlBlock, *PSDeFragControlBlock;

/* flags for options */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/dpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,


if (IS_FC_WEP(pbyFrame)) {
BOOL bRxDecryOK = FALSE;
bool bRxDecryOK = FALSE;

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n");
bIsWEP = TRUE;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/firmware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice)
const struct firmware *fw;
int NdisStatus;
void *pBuffer = NULL;
BOOL result = FALSE;
bool result = FALSE;
u16 wLength;
int ii, rc;

Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/staging/vt6656/iocmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ typedef struct tagSCmdBSSJoin {
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
u32 uChannel;
BOOL bPSEnable;
BOOL bShareKeyAuth;
bool bPSEnable;
bool bShareKeyAuth;

} __packed SCmdBSSJoin, *PSCmdBSSJoin;

Expand All @@ -133,7 +133,7 @@ typedef struct tagSCmdBSSJoin {

typedef struct tagSCmdZoneTypeSet {

BOOL bWrite;
bool bWrite;
WZONETYPE ZoneType;

} __packed SCmdZoneTypeSet, *PSCmdZoneTypeSet;
Expand All @@ -143,7 +143,7 @@ typedef struct tagSWPAResult {
u8 proto;
u8 key_mgmt;
u8 eap_type;
BOOL authenticated;
bool authenticated;
} __packed SWPAResult, *PSWPAResult;

typedef struct tagSCmdStartAP {
Expand All @@ -153,17 +153,17 @@ typedef struct tagSCmdStartAP {
u8 ssid[SSID_MAXLEN + 2];
u32 uChannel;
u32 uBeaconInt;
BOOL bShareKeyAuth;
bool bShareKeyAuth;
u8 byBasicRate;

} __packed SCmdStartAP, *PSCmdStartAP;

typedef struct tagSCmdSetWEP {

BOOL bEnableWep;
bool bEnableWep;
u8 byKeyIndex;
u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];
BOOL bWepKeyAvailable[WEP_NKEYS];
bool bWepKeyAvailable[WEP_NKEYS];
u32 auWepKeyLength[WEP_NKEYS];

} __packed SCmdSetWEP, *PSCmdSetWEP;
Expand All @@ -176,7 +176,7 @@ typedef struct tagSBSSIDItem {
u16 wBeaconInterval;
u16 wCapInfo;
u8 byNetType;
BOOL bWEPOn;
bool bWEPOn;
u32 uRSSI;

} __packed SBSSIDItem;
Expand All @@ -197,12 +197,12 @@ typedef struct tagSNodeItem {
u16 wInActiveCount;
u16 wEnQueueCnt;
u16 wFlags;
BOOL bPWBitOn;
bool bPWBitOn;
u8 byKeyIndex;
u16 wWepKeyLength;
u8 abyWepKey[WEP_KEYMAXLEN];
// Auto rate fallback vars
BOOL bIsInFallback;
bool bIsInFallback;
u32 uTxFailures;
u32 uTxAttempts;
u16 wFailureRatio;
Expand All @@ -220,7 +220,7 @@ typedef struct tagSNodeList {

typedef struct tagSCmdLinkStatus {

BOOL bLink;
bool bLink;
u16 wBSSType;
u8 byState;
u8 abyBSSID[BSSID_LEN];
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/key.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

typedef struct tagSKeyItem
{
BOOL bKeyValid;
bool bKeyValid;
u32 uKeyLength;
BYTE abyKey[MAX_KEY_LEN];
u64 KeyRSC;
Expand All @@ -76,9 +76,9 @@ typedef struct tagSKeyTable
SKeyItem PairwiseKey;
SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328
DWORD dwGTKeyIndex; // GroupTransmitKey Index
BOOL bInUse;
bool bInUse;
WORD wKeyCtl;
BOOL bSoftWEP;
bool bSoftWEP;
BYTE byReserved1[6];
} SKeyTable, *PSKeyTable; //352

Expand Down
Loading

0 comments on commit 8809a86

Please sign in to comment.