From patchwork Sun Feb 15 09:27:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 23195 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 93DC8DDDA0 for ; Sun, 15 Feb 2009 20:27:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751816AbZBOJ1W (ORCPT ); Sun, 15 Feb 2009 04:27:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751696AbZBOJ1V (ORCPT ); Sun, 15 Feb 2009 04:27:21 -0500 Received: from Chamillionaire.breakpoint.cc ([85.10.199.196]:58017 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512AbZBOJ1U (ORCPT ); Sun, 15 Feb 2009 04:27:20 -0500 Received: id: bigeasy by Chamillionaire.breakpoint.cc with local (easymta 1.00 BETA 1) id 1LYdHT-0003CX-IW; Sun, 15 Feb 2009 10:27:19 +0100 Date: Sun, 15 Feb 2009 10:27:19 +0100 From: Sebastian Andrzej Siewior To: Lennert Buytenhek Cc: netdev@vger.kernel.org Subject: [PATCH] net/mv643xx: don't disable the mib timer too early Message-ID: <20090215092719.GB12280@Chamillionaire.breakpoint.cc> MIME-Version: 1.0 Content-Disposition: inline X-Key-Id: FE3F4706 X-Key-Fingerprint: FFDA BBBB 3563 1B27 75C9 925B 98D5 5C1C FE3F 4706 User-Agent: Mutt/1.5.16 (2007-06-09) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org because mib_counters_update() also restarts the timer. So the timer is dequeued, the stats are read and then the timer is enqueued again. This is okay, unless someone unloads the module. Signed-off-by: Sebastian Andrzej Siewior --- drivers/net/mv643xx_eth.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 6977abe..3c6847a 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2213,8 +2213,6 @@ static int mv643xx_eth_stop(struct net_device *dev) wrlp(mp, INT_MASK, 0x00000000); rdlp(mp, INT_MASK); - del_timer_sync(&mp->mib_counters_timer); - napi_disable(&mp->napi); del_timer_sync(&mp->rx_oom); @@ -2226,6 +2224,7 @@ static int mv643xx_eth_stop(struct net_device *dev) port_reset(mp); mv643xx_eth_get_stats(dev); mib_counters_update(mp); + del_timer_sync(&mp->mib_counters_timer); skb_queue_purge(&mp->rx_recycle);