From b2b3d6298f3620717b213de32ffff9bf2222f0cc Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Mon, 10 Dec 2012 21:55:59 +0000
Subject: [PATCH] --- yaml --- r: 353872 b: refs/heads/master c:
 4f4a89c9cefeefa58006d02059b9fc7e078ae31a h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/vt6656/device.h |  3 ++-
 trunk/drivers/staging/vt6656/wmgr.h   | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dfc7cbad1b84..88d2aec7b187 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c65fa2a4c176c9bfab1ef954c4cef005dd9fb8b
+refs/heads/master: 4f4a89c9cefeefa58006d02059b9fc7e078ae31a
diff --git a/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h
index 047f55092078..37ec2344dbc2 100644
--- a/trunk/drivers/staging/vt6656/device.h
+++ b/trunk/drivers/staging/vt6656/device.h
@@ -392,7 +392,7 @@ typedef struct __device_opt {
 } OPTIONS, *POPTIONS;
 
 
-typedef struct __device_info {
+typedef struct vnt_private {
 
 // netdev
 	struct usb_device*          usb;
@@ -525,6 +525,7 @@ typedef struct __device_info {
 
 
     // 802.11 management
+	struct vnt_manager vnt_mgmt;
     SMgmtObject                 sMgmtObj;
 
 	u64 qwCurrTSF;
diff --git a/trunk/drivers/staging/vt6656/wmgr.h b/trunk/drivers/staging/vt6656/wmgr.h
index 876c3526da20..f98309b38980 100644
--- a/trunk/drivers/staging/vt6656/wmgr.h
+++ b/trunk/drivers/staging/vt6656/wmgr.h
@@ -218,8 +218,8 @@ typedef enum tagWMAC_POWER_MODE {
 
 
 
-// Tx Management Packet descriptor
-typedef struct tagSTxMgmtPacket {
+/* Tx Management Packet descriptor */
+typedef struct vnt_tx_mgmt {
 
     PUWLAN_80211HDR     p80211Header;
     unsigned int                cbMPDULen;
@@ -228,8 +228,8 @@ typedef struct tagSTxMgmtPacket {
 } STxMgmtPacket, *PSTxMgmtPacket;
 
 
-// Rx Management Packet descriptor
-typedef struct tagSRxMgmtPacket {
+/* Rx Management Packet descriptor */
+typedef struct vnt_rx_mgmt {
 
     PUWLAN_80211HDR     p80211Header;
 	u64 qwLocalTSF;
@@ -244,7 +244,7 @@ typedef struct tagSRxMgmtPacket {
 
 
 
-typedef struct tagSMgmtObject
+typedef struct vnt_manager
 {
 	void *pAdapter;
     // MAC address