From patchwork Wed Feb 24 16:00:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atsushi Nemoto X-Patchwork-Id: 46134 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 58A1AB7CF2 for ; Thu, 25 Feb 2010 03:00:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756911Ab0BXQA2 (ORCPT ); Wed, 24 Feb 2010 11:00:28 -0500 Received: from mv-drv-hcb004.ocn.ad.jp ([118.23.109.134]:52084 "EHLO mv-drv-hcb004.ocn.ad.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756886Ab0BXQA2 (ORCPT ); Wed, 24 Feb 2010 11:00:28 -0500 Received: from vcmba.ocn.ne.jp (localhost.localdomain [127.0.0.1]) by mv-drv-hcb004.ocn.ad.jp (Postfix) with ESMTP id ACF211B402E; Thu, 25 Feb 2010 01:00:22 +0900 (JST) Received: from localhost.localdomain (softbank221040169135.bbtec.net [221.40.169.135]) by vcmba.ocn.ne.jp (Postfix) with ESMTP; Thu, 25 Feb 2010 01:00:22 +0900 (JST) From: Atsushi Nemoto To: netdev@vger.kernel.org Cc: David Miller Subject: [PATCH] isa-skelton: Remove a wrong netif_wake_queue() call Date: Thu, 25 Feb 2010 01:00:17 +0900 Message-Id: <1267027217-7812-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The netif_wake_queue() is called correctly (i.e. only on !txfull condition) from net_tx(). So Unconditional call to the netif_wake_queue() here is wrong. This might cause calling of start_xmit routine on txfull state and trigger tx-ring overflow. This fix is ported from commit 662a96bd6f020782dfbdc0d0bd177c7dbb556687. Signed-off-by: Atsushi Nemoto --- drivers/net/isa-skeleton.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index 04d0502..3f33c90 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c @@ -536,7 +536,6 @@ static irqreturn_t net_interrupt(int irq, void *dev_id) /* Transmit complete. */ net_tx(dev); np->stats.tx_packets++; - netif_wake_queue(dev); } #endif if (status & COUNTERS_INTR) {