summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/wpa2.c
diff options
context:
space:
mode:
authorMalcolm Priestley2013-01-18 00:15:22 +0100
committerGreg Kroah-Hartman2013-01-18 21:39:01 +0100
commitd56131def640daa8b802dd7ddbffff30846005ac (patch)
tree4ea015d54fb7280a59fd1530d9fdf68b55b13767 /drivers/staging/vt6656/wpa2.c
parentstaging: alarm-dev: Implement compat_ioctl support (diff)
downloadkernel-qcow2-linux-d56131def640daa8b802dd7ddbffff30846005ac.tar.gz
kernel-qcow2-linux-d56131def640daa8b802dd7ddbffff30846005ac.tar.xz
kernel-qcow2-linux-d56131def640daa8b802dd7ddbffff30846005ac.zip
staging: vt6656: change bssdb/rxtx/wpa2 to new structures
Use struct vnt_private struct vnt_manager Move vnt_manager from sMgmtObj to vnt_mgmt. This patch cleans up function declarations, definitions and local variables where appropriate replacing types defined in "type.h" with linux/types.h. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/wpa2.c')
-rw-r--r--drivers/staging/vt6656/wpa2.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 616e24dcf42b..99b4589a6318 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -260,19 +260,16 @@ WPA2vParseRSN (
* Return Value: length of IEs.
*
-*/
-unsigned int
-WPA2uSetIEs(void *pMgmtHandle,
- PWLAN_IE_RSN pRSNIEs
- )
+unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs)
{
- PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
- PBYTE pbyBuffer = NULL;
- unsigned int ii = 0;
- PWORD pwPMKID = NULL;
+ struct vnt_manager *pMgmt = (struct vnt_manager *)pMgmtHandle;
+ u8 *pbyBuffer = NULL;
+ int ii = 0;
+ u16 *pwPMKID = NULL;
+
+ if (pRSNIEs == NULL)
+ return 0;
- if (pRSNIEs == NULL) {
- return(0);
- }
if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
(pMgmt->pCurrBSS != NULL)) {