diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-01 04:52:41 -0400 |
---|---|---|
committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-12 02:40:32 -0400 |
commit | 03ae1aac4af54b52ac501e507d75d8f37634b32e (patch) | |
tree | 60845d47ffe05607d3a2384dab39e0c45326afe2 /drivers/net/mv643xx_eth.c | |
parent | de34f225e112ddfabb56043a2be64bf7f69c1885 (diff) |
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"; | |||
176 | #define SMI_OPCODE_WRITE 0 /* Completion of Read */ | 176 | #define SMI_OPCODE_WRITE 0 /* Completion of Read */ |
177 | #define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */ | 177 | #define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */ |
178 | 178 | ||
179 | /* typedefs */ | ||
180 | |||
181 | typedef enum _func_ret_status { | ||
182 | ETH_OK, /* Returned as expected. */ | ||
183 | ETH_ERROR, /* Fundamental error. */ | ||
184 | ETH_RETRY, /* Could not process request. Try later.*/ | ||
185 | ETH_END_OF_JOB, /* Ring has nothing to process. */ | ||
186 | ETH_QUEUE_FULL, /* Ring resource error. */ | ||
187 | ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust. */ | ||
188 | } FUNC_RET_STATUS; | ||
189 | 179 | ||
190 | /* | 180 | /* |
191 | * RX/TX descriptors. | 181 | * RX/TX descriptors. |
@@ -251,17 +241,6 @@ struct tx_desc { | |||
251 | #define TX_IHL_SHIFT 11 | 241 | #define TX_IHL_SHIFT 11 |
252 | 242 | ||
253 | 243 | ||
254 | /* Unified struct for Rx and Tx operations. The user is not required to */ | ||
255 | /* be familier with neither Tx nor Rx descriptors. */ | ||
256 | struct pkt_info { | ||
257 | unsigned short byte_cnt; /* Descriptor buffer byte count */ | ||
258 | unsigned short l4i_chk; /* Tx CPU provided TCP Checksum */ | ||
259 | unsigned int cmd_sts; /* Descriptor command status */ | ||
260 | dma_addr_t buf_ptr; /* Descriptor buffer pointer */ | ||
261 | struct sk_buff *return_info; /* User resource return information */ | ||
262 | }; | ||
263 | |||
264 | |||
265 | /* global *******************************************************************/ | 244 | /* global *******************************************************************/ |
266 | struct mv643xx_eth_shared_private { | 245 | struct mv643xx_eth_shared_private { |
267 | void __iomem *base; | 246 | void __iomem *base; |