From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754121Ab0GNAty (ORCPT ); Tue, 13 Jul 2010 20:49:54 -0400 Received: from smtp-outbound-1.vmware.com ([65.115.85.69]:54798 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752347Ab0GNAtw (ORCPT ); Tue, 13 Jul 2010 20:49:52 -0400 Date: Tue, 13 Jul 2010 17:49:52 -0700 (PDT) From: Shreyas Bhatewara X-X-Sender: sbhatewara@localhost.localdomain To: netdev@vger.kernel.org cc: linux-kernel@vger.kernel.org, pv-drivers@vmware.com, ronghua@vmware.com, matthieu@vmware.com Subject: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not reset when the device is not opened If a reset is scheduled, and the device goes thru close and open, it may happen that reset and open may run in parallel. The reset code now bails out if the device is not opened. Signed-off-by: Ronghua Zang Signed-off-by: Matthieu Bucchianeri Signed-off-by: Shreyas Bhatewara --- drivers/net/vmxnet3/vmxnet3_drv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 1e31d40..ffd6a9b 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2417,8 +2417,9 @@ vmxnet3_reset_work(struct work_struct *data) if (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) return; - /* if the device is closed, we must leave it alone */ - if (netif_running(adapter->netdev)) { + /* if the device is closed or is being opened, we must leave it alone */ + if (netif_running(adapter->netdev) && + (adapter->netdev->flags & IFF_UP)) { printk(KERN_INFO "%s: resetting\n", adapter->netdev->name); vmxnet3_quiesce_dev(adapter); vmxnet3_reset_dev(adapter);