From patchwork Fri Aug 1 20:27:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Brown, Aaron F" X-Patchwork-Id: 375868 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 C2ECD140116 for ; Sat, 2 Aug 2014 06:23:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756324AbaHAUXe (ORCPT ); Fri, 1 Aug 2014 16:23:34 -0400 Received: from mga03.intel.com ([143.182.124.21]:60887 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756168AbaHAUXa (ORCPT ); Fri, 1 Aug 2014 16:23:30 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 01 Aug 2014 13:23:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,782,1400050800"; d="scan'208";a="464101573" Received: from unknown (HELO s252.jf.intel.com) ([10.166.34.165]) by azsmga001.ch.intel.com with ESMTP; 01 Aug 2014 13:23:25 -0700 From: Aaron Brown To: davem@davemloft.net Cc: Ashish Shah , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, Aaron Brown Subject: [net-next 11/14] i40evf: do not re-arm watchdog after remove Date: Fri, 1 Aug 2014 13:27:12 -0700 Message-Id: <1406924835-31550-12-git-send-email-aaron.f.brown@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406924835-31550-1-git-send-email-aaron.f.brown@intel.com> References: <1406924835-31550-1-git-send-email-aaron.f.brown@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ashish Shah Add in an adapter state check to prevent re-arming watchdog timer after i40evf_remove has been called and timer has been deleted. Change-ID: I636ba7c6322be8cbf053231959f90c0a2d8d803a Signed-off-by: Ashish Shah Tested-by: Sibai Li Signed-off-by: Aaron Brown --- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 4c01079..2aca9cf 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -1403,6 +1403,8 @@ static void i40evf_watchdog_task(struct work_struct *work) watchdog_done: clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section); restart_watchdog: + if (adapter->state == __I40EVF_REMOVE) + return; if (adapter->aq_required) mod_timer(&adapter->watchdog_timer, jiffies + msecs_to_jiffies(20));