Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353872
b: refs/heads/master
c: 4f4a89c
h: refs/heads/master
v: v3
  • Loading branch information
Malcolm Priestley authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 3b1ffb7 commit b2b3d62
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7c65fa2a4c176c9bfab1ef954c4cef005dd9fb8b
refs/heads/master: 4f4a89c9cefeefa58006d02059b9fc7e078ae31a
3 changes: 2 additions & 1 deletion trunk/drivers/staging/vt6656/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ typedef struct __device_opt {
} OPTIONS, *POPTIONS;


typedef struct __device_info {
typedef struct vnt_private {

// netdev
struct usb_device* usb;
Expand Down Expand Up @@ -525,6 +525,7 @@ typedef struct __device_info {


// 802.11 management
struct vnt_manager vnt_mgmt;
SMgmtObject sMgmtObj;

u64 qwCurrTSF;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/vt6656/wmgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -244,7 +244,7 @@ typedef struct tagSRxMgmtPacket {



typedef struct tagSMgmtObject
typedef struct vnt_manager
{
void *pAdapter;
// MAC address
Expand Down

0 comments on commit b2b3d62

Please sign in to comment.