mv643xx_eth: kill FUNC_RET_STATUS/pkt_info
authorLennert Buytenhek <buytenh@wantstofly.org>
Sun, 1 Jun 2008 08:52:41 +0000 (10:52 +0200)
committerLennert Buytenhek <buytenh@wantstofly.org>
Thu, 12 Jun 2008 06:40:32 +0000 (08:40 +0200)
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>
drivers/net/mv643xx_eth.c

index 0e4babbe37ae3a5192b14c7d25cea59df86b3523..ddd3e1148662dc356d1baa3037e0f56686c1cd3c 100644 (file)
@@ -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;