From patchwork Wed Apr 8 20:44:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 25735 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 B2024DE010 for ; Thu, 9 Apr 2009 06:44:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759968AbZDHUoR (ORCPT ); Wed, 8 Apr 2009 16:44:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757694AbZDHUoR (ORCPT ); Wed, 8 Apr 2009 16:44:17 -0400 Received: from xi.wantstofly.org ([80.101.37.227]:60295 "EHLO xi.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757843AbZDHUoQ (ORCPT ); Wed, 8 Apr 2009 16:44:16 -0400 Received: by xi.wantstofly.org (Postfix, from userid 500) id 8D5077F851; Wed, 8 Apr 2009 22:44:14 +0200 (CEST) Date: Wed, 8 Apr 2009 22:44:14 +0200 From: Lennert Buytenhek To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH] mv643xx_eth: don't reset the rx coal timer on interface up Message-ID: <20090408204414.GC4738@xi.wantstofly.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move SDMA configuration from interface up to port probe, to prevent overwriting the receive coalescing timer value on interface up. Signed-off-by: Lennert Buytenhek --- drivers/net/mv643xx_eth.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) (The affected code is new in 2.6.30-rcX, so this doesn't apply to 2.6.29.) diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index a56d9d2..b3185bf 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2274,8 +2274,6 @@ static void port_start(struct mv643xx_eth_private *mp) pscr |= FORCE_LINK_PASS; wrlp(mp, PORT_SERIAL_CONTROL, pscr); - wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); - /* * Configure TX path and queues. */ @@ -2957,6 +2955,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev) netif_carrier_off(dev); + wrlp(mp, SDMA_CONFIG, PORT_SDMA_CONFIG_DEFAULT_VALUE); + set_rx_coal(mp, 250); set_tx_coal(mp, 0);