From patchwork Wed May 12 23:29:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 52414 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 03BF7B7E06 for ; Thu, 13 May 2010 09:38:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506Ab0ELXiP (ORCPT ); Wed, 12 May 2010 19:38:15 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:49578 "EHLO mail-pz0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753147Ab0ELXiO (ORCPT ); Wed, 12 May 2010 19:38:14 -0400 Received: by pzk42 with SMTP id 42so348908pzk.4 for ; Wed, 12 May 2010 16:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=5emOoyAYVM5F/uYPKyEhhvC3RtMOoCeo64yAdw5vLVw=; b=vt9de7WPKIjnOCRODgjVSiQH4+oTNzAupJxo+yy+pE5I/pRrlZtzrN1f1t94QWoFz+ LNKGV+ur35q0ZFiw84fcOKrOql40O+o6iN/SvrB0fcamv/F6IxsgubdLvhp6klbK4MYr Hw+f/UACN3fj9yoBna6DrClBjnfSnhVMb89OU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=mMs852jAXG8T+xo2jZinI+C2TtsY8kjRLXyzIwP5eXZvvurlBMqp2U5b21fSA1aYQi NOFaFuMlgXfuCAGNyuiJV2BYb066yC0DdyAAp0yGtc0MtdtFRFA7B0V7gFyvrk5htBtO 4NrIUcjjdGSbM6N4dEr0MdBijAO0S1b5AM8v4= Received: by 10.140.248.20 with SMTP id v20mr5460906rvh.235.1273707492772; Wed, 12 May 2010 16:38:12 -0700 (PDT) Received: from [192.168.0.103] ([121.168.21.96]) by mx.google.com with ESMTPS id b10sm548756rvn.15.2010.05.12.16.38.11 (version=SSLv3 cipher=RC4-MD5); Wed, 12 May 2010 16:38:12 -0700 (PDT) Message-ID: <4BEB39C7.5010409@ring3k.org> Date: Thu, 13 May 2010 08:29:11 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.24 (X11/20100328) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org Subject: [PATCH 3/5] sky2: Shut off interrupts before NAPI Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Interrupts should be masked, then synchronized, and finally NAPI should be disabled. Signed-off-by: Mike McCormack --- drivers/net/sky2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 58ae840..04adcee 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -3266,10 +3266,10 @@ static void sky2_restart(struct work_struct *work) rtnl_lock(); - napi_disable(&hw->napi); - synchronize_irq(hw->pdev->irq); imask = sky2_read32(hw, B0_IMSK); sky2_write32(hw, B0_IMSK, 0); + synchronize_irq(hw->pdev->irq); + napi_disable(&hw->napi); for (i = 0; i < hw->ports; i++) { struct net_device *dev = hw->dev[i];