From patchwork Fri Apr 26 08:52:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 239764 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 BCBBF2C00F6 for ; Fri, 26 Apr 2013 18:53:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759336Ab3DZIxZ (ORCPT ); Fri, 26 Apr 2013 04:53:25 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50044 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758049Ab3DZIxX (ORCPT ); Fri, 26 Apr 2013 04:53:23 -0400 Received: from weser.hi.pengutronix.de ([10.1.0.109] helo=weser.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UVePC-0005sS-GK; Fri, 26 Apr 2013 10:53:22 +0200 From: Lucas Stach To: "netdev@vger.kernel.org" Cc: David Miller , Frank Li , Fabio Estevam , Shawn Guo , Lucas Stach Subject: [PATCH resend 1/3] Revert "net: fec: fix missing napi_disable call" Date: Fri, 26 Apr 2013 10:52:08 +0200 Message-Id: <1366966330-5181-1-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 X-SA-Exim-Connect-IP: 10.1.0.109 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 3f104c38259dcb3e5443c246f0805bc04d887cc3. In preparaton to revert the other NAPI related changes. Signed-off-by: Lucas Stach --- drivers/net/ethernet/freescale/fec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 73195f6..afb52eb 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -1490,7 +1490,6 @@ fec_enet_close(struct net_device *ndev) struct fec_enet_private *fep = netdev_priv(ndev); /* Don't know what to do yet. */ - napi_disable(&fep->napi); fep->opened = 0; netif_stop_queue(ndev); fec_stop(ndev);