Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030407AbWJCU5d (ORCPT ); Tue, 3 Oct 2006 16:57:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030409AbWJCU5d (ORCPT ); Tue, 3 Oct 2006 16:57:33 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:53162 "EHLO e34.co.us.ibm.com") by vger.kernel.org with ESMTP id S1030407AbWJCU5b (ORCPT ); Tue, 3 Oct 2006 16:57:31 -0400 Date: Tue, 3 Oct 2006 15:57:29 -0500 To: akpm@osdl.org, jeff@garzik.org Cc: netdev@vger.kernel.org, James K Lewis , linux-kernel@vger.kernel.org, Arnd Bergmann , linuxppc-dev@ozlabs.org Subject: [PATCH 1/4]: Spidernet stop queue when queue is full Message-ID: <20061003205729.GF4381@austin.ibm.com> References: <20061003205240.GE4381@austin.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061003205240.GE4381@austin.ibm.com> User-Agent: Mutt/1.5.11 From: linas@austin.ibm.com (Linas Vepstas) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2278 Lines: 75 Subject: [PATCH 1/4]: Spidernet stop queue when queue is full. This patch adds a call to netif_stop_queue() when there is no more room for more packets on the transmit queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann ---- drivers/net/spider_net.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) Index: linux-2.6.18-mm2/drivers/net/spider_net.c =================================================================== --- linux-2.6.18-mm2.orig/drivers/net/spider_net.c 2006-10-02 12:12:56.000000000 -0500 +++ linux-2.6.18-mm2/drivers/net/spider_net.c 2006-10-02 18:59:43.000000000 -0500 @@ -686,6 +686,7 @@ spider_net_prepare_tx_descr(struct spide /* Chain the bus address, so that the DMA engine finds this descr. */ descr->prev->next_descr_addr = descr->bus_addr; + card->netdev->trans_start = jiffies; return 0; } @@ -857,29 +858,23 @@ spider_net_xmit(struct sk_buff *skb, str spider_net_release_tx_chain(card, 0); - if (chain->head->next == chain->tail->prev) { - card->netdev_stats.tx_dropped++; - result = NETDEV_TX_LOCKED; - goto out; - } - - if (spider_net_get_descr_status(descr) != SPIDER_NET_DESCR_NOT_IN_USE) { - card->netdev_stats.tx_dropped++; + if ((chain->head->next == chain->tail->prev) || + (spider_net_get_descr_status(descr) != SPIDER_NET_DESCR_NOT_IN_USE)) { result = NETDEV_TX_LOCKED; goto out; } if (spider_net_prepare_tx_descr(card, skb) != 0) { - card->netdev_stats.tx_dropped++; result = NETDEV_TX_BUSY; goto out; } - result = NETDEV_TX_OK; spider_net_kick_tx_dma(card); + return NETDEV_TX_OK; out: - netif_wake_queue(netdev); + card->netdev_stats.tx_dropped++; + netif_stop_queue(netdev); return result; } @@ -898,6 +893,8 @@ spider_net_cleanup_tx_ring(struct spider if ((spider_net_release_tx_chain(card, 0) != 0) && (card->netdev->flags & IFF_UP)) spider_net_kick_tx_dma(card); + + netif_wake_queue(card->netdev); } /** - 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/