diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-01 10:52:41 +0200 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-12 08:40:32 +0200 |
| commit | 03ae1aac4af54b52ac501e507d75d8f37634b32e (patch) | |
| tree | 60845d47ffe05607d3a2384dab39e0c45326afe2 /drivers/net/mv643xx_eth.c | |
| parent | mv643xx_eth: move rx_return_buff() into its only caller (diff) | |
| download | linux-03ae1aac4af54b52ac501e507d75d8f37634b32e.tar.xz linux-03ae1aac4af54b52ac501e507d75d8f37634b32e.zip | |
mv643xx_eth: kill FUNC_RET_STATUS/pkt_info
Since they are no longer used, kill enum FUNC_RET_STATUS and
struct pkt_info (which were a rather roundabout way of communicating
RX/TX status within the same driver).
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Dale Farnsworth <dale@farnsworth.org>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 0e4babbe37ae..ddd3e1148662 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -176,16 +176,6 @@ static char mv643xx_eth_driver_version[] = "1.0"; #define SMI_OPCODE_WRITE 0 /* Completion of Read */ #define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */ -/* typedefs */ - -typedef enum _func_ret_status { - ETH_OK, /* Returned as expected. */ - ETH_ERROR, /* Fundamental error. */ - ETH_RETRY, /* Could not process request. Try later.*/ - ETH_END_OF_JOB, /* Ring has nothing to process. */ - ETH_QUEUE_FULL, /* Ring resource error. */ - ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust. */ -} FUNC_RET_STATUS; /* * RX/TX descriptors. @@ -251,17 +241,6 @@ struct tx_desc { #define TX_IHL_SHIFT 11 -/* Unified struct for Rx and Tx operations. The user is not required to */ -/* be familier with neither Tx nor Rx descriptors. */ -struct pkt_info { - unsigned short byte_cnt; /* Descriptor buffer byte count */ - unsigned short l4i_chk; /* Tx CPU provided TCP Checksum */ - unsigned int cmd_sts; /* Descriptor command status */ - dma_addr_t buf_ptr; /* Descriptor buffer pointer */ - struct sk_buff *return_info; /* User resource return information */ -}; - - /* global *******************************************************************/ struct mv643xx_eth_shared_private { void __iomem *base; |