This patch and the next 8 patches remove the old structure names and
replace;
struct vnt_private for DEVICE_INFO and PSDevice
struct vnt_manager for SMgmtObject
struct vnt_rx_mgmt for SRxMgmtPacket and PSRxMgmtPacket
struct vnt_tx_mgmt for STxMgmtPacket and PSTxMgmtPacket
and
struct vnt_manager vnt_mgmt
to replace
SMgmtObject sMgmtObj;
Applied after patch staging: vt6656: dpc.c :RXbBulkInProcessData clean up RSC
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/device.h | 3 ++-
drivers/staging/vt6656/wmgr.h | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 047f550..37ec234 100644
--- a/drivers/staging/vt6656/device.h
+++ b/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/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index 876c352..f98309b 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/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
--
1.8.0
On Mon, 2013-01-07 at 11:14 -0800, Greg KH wrote:
> On Mon, Dec 10, 2012 at 09:55:59PM +0000, Malcolm Priestley wrote:
> >
> > This patch and the next 8 patches remove the old structure names and
> > replace;
> >
> >
> > struct vnt_private for DEVICE_INFO and PSDevice
> > struct vnt_manager for SMgmtObject
> > struct vnt_rx_mgmt for SRxMgmtPacket and PSRxMgmtPacket
> > struct vnt_tx_mgmt for STxMgmtPacket and PSTxMgmtPacket
> >
> > and
> >
> > struct vnt_manager vnt_mgmt
> > to replace
> > SMgmtObject sMgmtObj;
> >
> > Applied after patch staging: vt6656: dpc.c :RXbBulkInProcessData clean up RSC
>
> Not all of these patches could be applied, can you please redo the ones
> I didn't apply and resend them?
>
Yes, the missing rebased patches have been sent.
Regards
Malcolm
On Mon, Dec 10, 2012 at 09:55:59PM +0000, Malcolm Priestley wrote:
>
> This patch and the next 8 patches remove the old structure names and
> replace;
>
>
> struct vnt_private for DEVICE_INFO and PSDevice
> struct vnt_manager for SMgmtObject
> struct vnt_rx_mgmt for SRxMgmtPacket and PSRxMgmtPacket
> struct vnt_tx_mgmt for STxMgmtPacket and PSTxMgmtPacket
>
> and
>
> struct vnt_manager vnt_mgmt
> to replace
> SMgmtObject sMgmtObj;
>
> Applied after patch staging: vt6656: dpc.c :RXbBulkInProcessData clean up RSC
Not all of these patches could be applied, can you please redo the ones
I didn't apply and resend them?
thanks,
greg k-h