diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/iocmd.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/iocmd.h')
-rw-r--r-- | drivers/staging/vt6655/iocmd.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h index ada9ee9..60c0a36 100644 --- a/drivers/staging/vt6655/iocmd.h +++ b/drivers/staging/vt6655/iocmd.h @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 2003 VIA Networking, Inc. All rights reserved. + * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. + * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,10 +29,7 @@ #ifndef __IOCMD_H__ #define __IOCMD_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -73,12 +71,12 @@ typedef enum tagWMAC_CMD { WLAN_CMD_SET_HOST_WEP, WLAN_CMD_SET_WPA, WLAN_CMD_GET_NODE_CNT, - WLAN_CMD_ZONETYPE_SET, + WLAN_CMD_ZONETYPE_SET, WLAN_CMD_GET_NODE_LIST -} WMAC_CMD, DEF* PWMAC_CMD; +} WMAC_CMD, *PWMAC_CMD; - typedef enum tagWZONETYPE { +typedef enum tagWZONETYPE { ZoneType_USA=0, ZoneType_Japan=1, ZoneType_Europe=2 @@ -106,7 +104,6 @@ typedef enum tagWMAC_CMD { #define WEP_104BIT_LEN 13 #define WEP_232BIT_LEN 16 - // Ioctl interface structure // Command structure // @@ -118,7 +115,6 @@ typedef struct tagSCmdRequest { U16 wCmdCode; } SCmdRequest, *PSCmdRequest; - // // Scan // @@ -145,6 +141,10 @@ typedef struct tagSCmdBSSJoin { } SCmdBSSJoin, *PSCmdBSSJoin; +// +// Zonetype Setting +// + typedef struct tagSCmdZoneTypeSet { BOOL bWrite; @@ -162,7 +162,6 @@ typedef struct tagSWPAResult { } SWPAResult, *PSWPAResult; #endif - typedef struct tagSCmdStartAP { U16 wBSSType; @@ -242,7 +241,7 @@ typedef struct tagSDot11MIBCount { U32 ReceivedFragmentCount; U32 MulticastReceivedFrameCount; U32 FCSErrorCount; -} SDot11MIBCount, DEF* PSDot11MIBCount; +} SDot11MIBCount, *PSDot11MIBCount; @@ -349,7 +348,7 @@ typedef struct tagSStatMIBCount { U32 ullTxBroadcastBytes[2]; U32 ullTxMulticastBytes[2]; U32 ullTxDirectedBytes[2]; -} SStatMIBCount, DEF* PSStatMIBCount; +} SStatMIBCount, *PSStatMIBCount; typedef struct tagSNodeItem { |