From 4910cfc935efda47da6f92d9280fba435cc11157 Mon Sep 17 00:00:00 2001 From: Georg Hofmann Date: Thu, 14 Mar 2013 06:54:09 +0000 Subject: [PATCH] --- yaml --- r: 361446 b: refs/heads/master c: 3f104c38259dcb3e5443c246f0805bc04d887cc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ffaae93bea28..b023aa469aa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d97e74976982a35168c7f131cce0d93537337a26 +refs/heads/master: 3f104c38259dcb3e5443c246f0805bc04d887cc3 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index 61d2e6202bf3..e3f39372ce25 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -1441,6 +1441,7 @@ 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);