From patchwork Fri May 30 16:40:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 354266 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8C6BA1400DA for ; Sat, 31 May 2014 02:41:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933910AbaE3Qlb (ORCPT ); Fri, 30 May 2014 12:41:31 -0400 Received: from top.free-electrons.com ([176.31.233.9]:58458 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933898AbaE3Qla (ORCPT ); Fri, 30 May 2014 12:41:30 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 26C72939; Fri, 30 May 2014 18:41:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (unknown [190.2.108.30]) by mail.free-electrons.com (Postfix) with ESMTPSA id DD16488A; Fri, 30 May 2014 18:41:28 +0200 (CEST) From: Ezequiel Garcia To: Cc: Eric Dumazet , David Miller , Thomas Petazzoni , Gregory Clement , Lior Amsalem , Tawfik Bayouk , fugang.duan@freescale.com, Willy Tarreau , Ezequiel Garcia Subject: [PATCH 7/8] net: mv643xx_eth: Drop the NETDEV_TX_BUSY return path Date: Fri, 30 May 2014 13:40:10 -0300 Message-Id: <1401468011-10609-8-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401468011-10609-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1401468011-10609-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After adding proper stop/wake thresholds, we can expect a queue to never be full and drop the NETDEV_TX_BUSY return path. In any case, if the queue cannot accommodate a TSO packet, the packet would be discarded. Signed-off-by: Ezequiel Garcia --- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 2cea86d..88afbe0 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -996,8 +996,6 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) if (txq->tx_desc_count >= txq->tx_stop_threshold) netif_tx_stop_queue(nq); - } else if (ret == -EBUSY) { - return NETDEV_TX_BUSY; } else { txq->tx_dropped++; dev_kfree_skb_any(skb);