From 4d49d54429016d1b2dc8f2dd5eb5a0006509ddfd Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Mon, 4 Jun 2012 06:36:22 +0000 Subject: [PATCH] --- yaml --- r: 313879 b: refs/heads/master c: 13497f58670c4e7a30170738f07b17d90011c785 h: refs/heads/master i: 313877: 4abab527991f86a3ed8870488baed86172033a3a 313875: ed2a3faf042f06e5b3df37e0ce32e428968238b6 313871: 5ab7ca7019805f5f203c9e2c582bdc0d66b4eff8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac3cf51b5de7..0b3bce1ad1d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f07d90107caeaa6913c70ad97b536f8cec45e8e7 +refs/heads/master: 13497f58670c4e7a30170738f07b17d90011c785 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 70966330f44e..0caae72cda89 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -677,7 +677,7 @@ static void stmmac_tx(struct stmmac_priv *priv) priv->hw->desc->release_tx_desc(p); - entry = (++priv->dirty_tx) % txsize; + priv->dirty_tx++; } if (unlikely(netif_queue_stopped(priv->dev) && stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv))) { @@ -1307,7 +1307,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) display_ring(priv->dma_rx, rxsize); } #endif - count = 0; while (!priv->hw->desc->get_rx_owner(p)) { int status;