Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 197181
b: refs/heads/master
c: e7b07d1
h: refs/heads/master
i:
  197179: 1edc3ea
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 1ce9164 commit 49b6a77
Show file tree
Hide file tree
Showing 39 changed files with 39 additions and 107 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: 8611a29ab967bc197494db19d31994d1b5a26fdc
refs/heads/master: e7b07d1d8936e06f88dbe227401ce659c2f9dee5
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 @@ -43,4 +43,4 @@
/*--------------------- Export Functions --------------------------*/
BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);

#endif //__AES_H__
#endif /* __AES_CCMP_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/baseband.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ void BBvUpdatePreEDThreshold(
BOOL bScanning
);

#endif // __BASEBAND_H__
#endif /* __BASEBAND_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/bssdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,4 @@ BSSvClearAnyBSSJoinRecord(
HANDLE hDeviceContext
);

#endif //__BSSDB_H__
#endif /* __BSSDB_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/card.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,4 @@ CARDbChannelSwitch (
BYTE byCount
);

#endif // __CARD_H__



#endif /* __CARD_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/control.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,4 @@ void ControlvMaskByte(
BYTE byData
);

#endif // __RCV_H__



#endif /* __CONTROL_H__ */
3 changes: 1 addition & 2 deletions trunk/drivers/staging/vt6656/datarate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,4 @@ DATARATEbyGetRateIdx(
BYTE byRate
);


#endif //__DATARATE_H__
#endif /* __DATARATE_H__ */
6 changes: 1 addition & 5 deletions trunk/drivers/staging/vt6656/desc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,4 @@ SKeyEntry;

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




#endif // __DESC_H__

#endif /* __DESC_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/dpc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,4 @@ RXbBulkInProcessData(
ULONG BytesToIndicate
);

#endif // __RXTX_H__



#endif /* __RXTX_H__ */
3 changes: 1 addition & 2 deletions trunk/drivers/staging/vt6656/firmware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ FIRMWAREbCheckVersion(
PSDevice pDevice
);


#endif // __FIRMWARE_H__
#endif /* __FIRMWARE_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/hostap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,4 @@
int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p);

#endif // __HOSTAP_H__



#endif /* __HOSTAP_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/int.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,4 @@ INTnsProcessData(
PSDevice pDevice
);

#endif // __INT_H__



#endif /* __INT_H__ */
4 changes: 1 addition & 3 deletions trunk/drivers/staging/vt6656/iocmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,4 @@ struct viawget_hostapd_param {

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



#endif //__IOCMD_H__
#endif /* __IOCMD_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/ioctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,4 @@ void vConfigWEPKey (
);
*/

#endif // __IOCTL_H__



#endif /* __IOCTL_H__ */
4 changes: 1 addition & 3 deletions trunk/drivers/staging/vt6656/iowpa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,4 @@ struct viawget_scan_result {

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



#endif //__IOWPA_H__
#endif /* __IOWPA_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/iwctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,4 @@ int iwctl_siwmlme(struct net_device *dev,
extern const struct iw_handler_def iwctl_handler_def;
extern const struct iw_priv_args iwctl_private_args;

#endif // __IWCTL_H__



#endif /* __IWCTL_H__ */
3 changes: 1 addition & 2 deletions trunk/drivers/staging/vt6656/key.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,4 @@ BOOL KeybSetAllGroupKey(
BYTE byKeyDecMode
);

#endif // __KEY_H__

#endif /* __KEY_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/mac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,4 +439,4 @@ void MACvEnableBarkerPreambleMd(PSDevice pDevice);
void MACvDisableBarkerPreambleMd(PSDevice pDevice);
void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval);

#endif // __MAC_H__
#endif /* __MAC_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/mib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,4 @@ STAvUpdateUSBCounter(
NTSTATUS ntStatus
);

#endif // __MIB_H__



#endif /* __MIB_H__ */
4 changes: 1 addition & 3 deletions trunk/drivers/staging/vt6656/michael.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,4 @@ void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);
( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) )
#define ROR32( A, n ) ROL32( (A), 32-(n) )

#endif //__MICHAEL_H__


#endif /* __MICHAEL_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/power.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ PSbIsNextTBTTWakeUp(
HANDLE hDeviceContext
);

#endif //__POWER_H__
#endif /* __POWER_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/rc4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len);
UINT rc4_byte(PRC4Ext pRC4);
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len);

#endif //__RC4_H__
#endif /* __RC4_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/rf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,4 @@ BOOL s_bVT3226D0_11bLoCurrentAdjust(
BOOL b11bMode
);

#endif // __RF_H__



#endif /* __RF_H__ */
3 changes: 1 addition & 2 deletions trunk/drivers/staging/vt6656/rndis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,4 @@ typedef struct _CMD_CHANGE_BBTYPE

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


#endif // _RNDIS_H_
#endif /* _RNDIS_H_ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/rxtx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,4 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex);

#endif // __RXTX_H__



#endif /* __RXTX_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/srom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ typedef struct tagSSromReg {

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

#endif // __EEPROM_H__
#endif /* __EEPROM_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/tcrc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@ DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte);
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC);

#endif // __TCRC_H__



#endif /* __TCRC_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/tether.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,4 @@ BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength);

#endif // __TETHER_H__



#endif /* __TETHER_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/tkip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,4 @@ void TKIPvMixKey(
PBYTE pbyRC4Key
);

#endif // __TKIP_H__



#endif /* __TKIP_H__ */
4 changes: 1 addition & 3 deletions trunk/drivers/staging/vt6656/tmacro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,4 @@
#define MAKEDWORD(lw, hw) ((DWORD)(((WORD)(lw)) | (((DWORD)((WORD)(hw))) << 16)))
#endif

#endif // __TMACRO_H__


#endif /* __TMACRO_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/ttype.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@ typedef void *HANDLE;
typedef void *HANDLE;
#endif

#endif // __TTYPE_H__
#endif /* __TTYPE_H__ */
6 changes: 1 addition & 5 deletions trunk/drivers/staging/vt6656/upc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,4 @@

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




#endif // __UPC_H__

#endif /* __UPC_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/usbpipe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,4 @@ PIPEnsSendBulkOut(
PUSB_SEND_CONTEXT pContext
);

#endif // __USBPIPE_H__



#endif /* __USBPIPE_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/wcmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ BSSvSecondTxData(
);
#endif

#endif //__WCMD_H__
#endif /* __WCMD_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/wctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,4 @@ BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFra
UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);

#endif // __WCTL_H__



#endif /* __WCTL_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/wmgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,4 @@ vFlush_PMKID_Candidate (
HANDLE hDeviceContext
);

#endif // __WMGR_H__
#endif /* __WMGR_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/wpa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ WPAb_Is_RSN(
PWLAN_IE_RSN_EXT pRSN
);

#endif // __WPA_H__
#endif /* __WPA_H__ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/wpa2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ WPA2uSetIEs(
OUT PWLAN_IE_RSN pRSNIEs
);

#endif // __WPA2_H__
#endif /* __WPA2_H__ */
5 changes: 1 addition & 4 deletions trunk/drivers/staging/vt6656/wpactl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,4 @@ int wpa_set_wpadev(PSDevice pDevice, int val);
int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel);

#endif // __WPACL_H__



#endif /* __WPACL_H__ */

0 comments on commit 49b6a77

Please sign in to comment.