Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758524Ab0FVNCs (ORCPT ); Tue, 22 Jun 2010 09:02:48 -0400 Received: from i1.inoi.fi ([194.100.97.46]:40213 "EHLO mail.inoi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758236Ab0FVNCp (ORCPT ); Tue, 22 Jun 2010 09:02:45 -0400 From: Petri Lehtinen To: linux-kernel@vger.kernel.org Cc: stable@kernel.org, netdev@vger.kernel.org, Jiajun Wu , Anton Vorontsov , Stable , "[2.6.32]"@mail.srv.inoi.fi, "David S. Miller" Subject: [PATCH 3/3] ucc_geth: Fix full TX queue processing Date: Tue, 22 Jun 2010 16:02:32 +0300 Message-Id: <1277211752-14265-4-git-send-email-petri.lehtinen@inoi.fi> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277211752-14265-1-git-send-email-petri.lehtinen@inoi.fi> References: <1277211752-14265-1-git-send-email-petri.lehtinen@inoi.fi> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1799 Lines: 51 From: Jiajun Wu commit 7583605b6d29f1f7f6fc505b883328089f3485ad ("ucc_geth: Fix empty TX queue processing") fixed empty TX queue mishandling, but didn't account another corner case: when TX queue becomes full. Without this patch the driver will stop transmiting when TX queue becomes full since 'bd == ugeth->txBd[txQ]' actually checks for two things: queue empty or full. Let's better check for NULL skb, which unambiguously signals an empty queue. Signed-off-by: Jiajun Wu Signed-off-by: Anton Vorontsov Cc: Stable [2.6.32] Signed-off-by: David S. Miller (cherry picked from commit 34692421bc7d6145ef383b014860f4fde10b7505) --- drivers/net/ucc_geth.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 5077fd9..b4b25ff 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -3276,13 +3276,12 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) /* Handle the transmitted buffer and release */ /* the BD to be used with the current frame */ - if (bd == ugeth->txBd[txQ]) /* queue empty? */ + skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]]; + if (!skb) break; dev->stats.tx_packets++; - skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]]; - if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN && skb_recycle_check(skb, ugeth->ug_info->uf_info.max_rx_buf_length + -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/