From patchwork Fri Jan 14 13:02:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Hellstrom X-Patchwork-Id: 78892 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 45A13B70CC for ; Sat, 15 Jan 2011 00:03:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757309Ab1ANNC6 (ORCPT ); Fri, 14 Jan 2011 08:02:58 -0500 Received: from mail175c2.megamailservers.com ([69.49.111.75]:57036 "EHLO mail175c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756847Ab1ANNCy (ORCPT ); Fri, 14 Jan 2011 08:02:54 -0500 X-POP-User: sandi@gaisler.com Received: from localhost.localdomain (static-92-33-28-242.sme.bredbandsbolaget.se [92.33.28.242]) by mail175c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id p0ED2mBo016470; Fri, 14 Jan 2011 08:02:50 -0500 From: Daniel Hellstrom To: davem@davemloft.net Cc: netdev@vger.kernel.org, kristoffer@gaisler.com Subject: [PATCH 2/7 v2] GRETH: fix opening/closing Date: Fri, 14 Jan 2011 14:02:38 +0100 Message-Id: <1295010163-2585-2-git-send-email-daniel@gaisler.com> X-Mailer: git-send-email 1.5.4 In-Reply-To: <1295010163-2585-1-git-send-email-daniel@gaisler.com> References: <1295010163-2585-1-git-send-email-daniel@gaisler.com> X-CSC: 0 X-CHA: v=1.1 cv=0J/+zcfpZqnYLmiDeyIFo++f7xpDbu+58lrGJvU/+0Q= c=1 sm=1 a=nlxXDntu30kA:10 a=jXKJviUpWSOlMmIvGrHOfw==:17 a=ebG-ZW-8AAAA:8 a=DTMNOGPX3DzevPfvWfcA:9 a=GxY29Qzi_bJoBf46KJdcFzwiuTYA:4 a=cCYF7-FHeg4A:10 a=jXKJviUpWSOlMmIvGrHOfw==:117 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When NAPI is disabled there is no point in having IRQs enabled, TX/RX should be off before clearing the TX/RX descriptor rings. Signed-off-by: Daniel Hellstrom --- drivers/net/greth.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 1c2dbdb..b307696 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -356,6 +356,8 @@ static int greth_open(struct net_device *dev) dev_dbg(&dev->dev, " starting queue\n"); netif_start_queue(dev); + GRETH_REGSAVE(greth->regs->status, 0xFF); + napi_enable(&greth->napi); greth_enable_irqs(greth); @@ -371,7 +373,9 @@ static int greth_close(struct net_device *dev) napi_disable(&greth->napi); + greth_disable_irqs(greth); greth_disable_tx(greth); + greth_disable_rx(greth); netif_stop_queue(dev);