From patchwork Wed May 12 11:06:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 52378 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 AA91EB7DF5 for ; Wed, 12 May 2010 21:04:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755682Ab0ELLEa (ORCPT ); Wed, 12 May 2010 07:04:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38468 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755661Ab0ELLE1 (ORCPT ); Wed, 12 May 2010 07:04:27 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4CB4JBC006265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 May 2010 07:04:19 -0400 Received: from dhcp-lab-109.englab.brq.redhat.com (dhcp-31-130.brq.redhat.com [10.34.31.130]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4CB4GVC022300; Wed, 12 May 2010 07:04:17 -0400 Date: Wed, 12 May 2010 13:06:28 +0200 From: Stanislaw Gruszka To: netdev@vger.kernel.org Cc: Eric Dumazet , Eilon Greenstein , Vladislav Zolotarov , Dmitry Kravkov , Michael Chan , Breno Leitao , Matt Carlson Subject: [RFC PATCH] bnx2: use netif_carrier_off to prevent tx timeout Message-ID: <20100512130628.69bc3890@dhcp-lab-109.englab.brq.redhat.com> In-Reply-To: <20100512125815.0dad8ad0@dhcp-lab-109.englab.brq.redhat.com> References: <20100512110921.0e3f45fc@dhcp-lab-109.englab.brq.redhat.com> <1273656458.2621.22.camel@edumazet-laptop> <20100512125815.0dad8ad0@dhcp-lab-109.englab.brq.redhat.com> Organization: RedHat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Touching ->trans_start make netdev watchdog timeouts only less probable. Use netif_carrier_off to prevent timeout, lately we take care of tuning carrier on. Signed-off-by: Stanislaw Gruszka --- Patch was not tested! drivers/net/bnx2.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 667f419..44fc392 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -656,17 +656,9 @@ bnx2_netif_stop(struct bnx2 *bp, bool stop_cnic) if (stop_cnic) bnx2_cnic_stop(bp); if (netif_running(bp->dev)) { - int i; - bnx2_napi_disable(bp); netif_tx_disable(bp->dev); - /* prevent tx timeout */ - for (i = 0; i < bp->dev->num_tx_queues; i++) { - struct netdev_queue *txq; - - txq = netdev_get_tx_queue(bp->dev, i); - txq->trans_start = jiffies; - } + netif_carrier_off(bp->dev); } bnx2_disable_int_sync(bp); } @@ -6346,6 +6338,8 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp) if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1); + if (bp->link_up) + netif_carrier_on(bp->dev); bnx2_netif_start(bp, false); } #endif