aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-06-01 02:40:33 +0200
committerLennert Buytenhek <buytenh@wantstofly.org>2008-06-12 08:40:31 +0200
commitfab1f6b1e25c2c7e9d0b79e589a5e48fdead47f6 (patch)
treef5ccc7b3aeee7d4299f3276a90d3c16dddffe5c0 /drivers/net/mv643xx_eth.c
parent5dc4d174e2fc0a30ae8fbeb0de81d7cef21f8885 (diff)
mv643xx_eth: kill ->rx_resource_err
The ->rx_resource_err variable doesn't serve a useful purpose -- kill it. 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.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 63e0d0fff95..f23e82c84ae 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -320,8 +320,6 @@ struct mv643xx_eth_private {
u32 tx_sram_addr; /* Base address of tx sram area */
u32 tx_sram_size; /* Size of tx sram area */
- int rx_resource_err; /* Rx ring resource error flag */
-
/* Tx/Rx rings managment indexes fields. For driver use */
/* Next available and first returning Rx resource */
@@ -472,9 +470,6 @@ static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mp,
/* Move the used descriptor pointer to the next descriptor */
mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
- /* Any Rx return cancels the Rx resource error status */
- mp->rx_resource_err = 0;
-
spin_unlock_irqrestore(&mp->lock, flags);
return ETH_OK;
@@ -531,10 +526,6 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mp,
unsigned int command_status;
unsigned long flags;
- /* Do not process Rx ring in case of Rx ring resource error */
- if (mp->rx_resource_err)
- return ETH_QUEUE_FULL;
-
spin_lock_irqsave(&mp->lock, flags);
/* Get the Rx Desc ring 'curr and 'used' indexes */
@@ -569,10 +560,6 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mp,
rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
mp->rx_curr_desc_q = rx_next_curr_desc;
- /* Rx descriptors exhausted. Set the Rx ring resource error flag */
- if (rx_next_curr_desc == rx_used_desc)
- mp->rx_resource_err = 1;
-
spin_unlock_irqrestore(&mp->lock, flags);
return ETH_OK;
@@ -1760,8 +1747,6 @@ static unsigned int set_tx_coal(struct mv643xx_eth_private *mp,
static void port_init(struct mv643xx_eth_private *mp)
{
- mp->rx_resource_err = 0;
-
port_reset(mp);
init_mac_tables(mp);