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/winbond/mds_s.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/winbond/mds_s.h')
-rw-r--r-- | drivers/staging/winbond/mds_s.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h index 9ffec17..e8e13bd 100644 --- a/drivers/staging/winbond/mds_s.h +++ b/drivers/staging/winbond/mds_s.h @@ -67,7 +67,6 @@ enum { #define RX_BUF_SIZE 2352 // 600 // For 301 must be multiple of 8 #define MAX_RX_DESCRIPTORS 18 // Rx Layer 2 -#define MAX_BUFFER_QUEUE 8 // The value is always equal 8 due to NDIS_PACKET's MiniportReserved field size // For brand-new rx system @@ -79,8 +78,7 @@ enum { #define PACKET_COME_FROM_MLME 0x80 #define PACKET_SEND_COMPLETE 0xff -typedef struct _MDS -{ +struct wb35_mds { // For Tx usage u8 TxOwner[ ((MAX_USB_TX_BUFFER_NUMBER + 3) & ~0x03) ]; u8 *pTxBuffer; @@ -133,16 +131,7 @@ typedef struct _MDS u32 TxTsc; // 20060214 u32 TxTsc_2; // 20060214 -} MDS, *PMDS; - - -typedef struct _RxBuffer -{ - u8 * pBufferAddress; // Pointer the received data buffer. - u16 BufferSize; - u8 RESERVED; - u8 BufferIndex;// Only 1 byte -} RXBUFFER, *PRXBUFFER; +}; // // Reveive Layer 1 Format. @@ -162,8 +151,6 @@ typedef struct _RXLAYER1 u32 FirstFrameArrivedTime; - RXBUFFER BufferQueue[ MAX_BUFFER_QUEUE ]; - u8 LastFrameType; // 20061004 for fix intel 3945 's bug u8 RESERVED[3]; //@@ anson |