From patchwork Wed Jul 29 08:51:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 30331 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5EDACB7EFA for ; Wed, 29 Jul 2009 18:20:01 +1000 (EST) Received: by ozlabs.org (Postfix) id 51DA6DDD0B; Wed, 29 Jul 2009 18:20:01 +1000 (EST) 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 D9574DDD01 for ; Wed, 29 Jul 2009 18:20:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbZG2ITx (ORCPT ); Wed, 29 Jul 2009 04:19:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750794AbZG2ITx (ORCPT ); Wed, 29 Jul 2009 04:19:53 -0400 Received: from az33egw02.freescale.net ([192.88.158.103]:42072 "EHLO az33egw02.freescale.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbZG2ITv (ORCPT ); Wed, 29 Jul 2009 04:19:51 -0400 Received: from de01smr01.freescale.net (de01smr01.freescale.net [10.208.0.31]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id n6T8JYr0014269 for ; Wed, 29 Jul 2009 01:19:45 -0700 (MST) Received: from zch01exm26.fsl.freescale.net (zch01exm26.ap.freescale.net [10.192.129.221]) by de01smr01.freescale.net (8.13.1/8.13.0) with ESMTP id n6T8JkMZ003494 for ; Wed, 29 Jul 2009 03:19:47 -0500 (CDT) Received: from localhost ([10.193.20.133]) by zch01exm26.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.3959); Wed, 29 Jul 2009 16:19:31 +0800 From: Li Yang To: davem@davemloft.net Cc: netdev@vger.kernel.org, linuxppc-dev@ozlabs.org, Jiajun Wu , Li Yang Subject: [PATCH] gianfar: fix coalescing setup in ethtool support Date: Wed, 29 Jul 2009 16:51:57 +0800 Message-Id: <1248857517-8270-1-git-send-email-leoli@freescale.com> X-Mailer: git-send-email 1.6.3.1.6.g4bf1f X-OriginalArrivalTime: 29 Jul 2009 08:19:31.0977 (UTC) FILETIME=[4CADBF90:01CA1025] X-Brightmail-Tracker: AAAAAQAAAWE= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiajun Wu Parameter order for using mk_ic_value(count, time) was reversed, the patch fixes this. Signed-off-by: Jiajun Wu Signed-off-by: Li Yang --- drivers/net/gianfar_ethtool.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 2a7edfa..3109f4b 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c @@ -373,9 +373,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals return -EINVAL; } - priv->rxic = mk_ic_value( - gfar_usecs2ticks(priv, cvals->rx_coalesce_usecs), - cvals->rx_max_coalesced_frames); + priv->rxic = mk_ic_value(cvals->rx_max_coalesced_frames, + gfar_usecs2ticks(priv, cvals->rx_coalesce_usecs)); /* Set up tx coalescing */ if ((cvals->tx_coalesce_usecs == 0) || @@ -397,9 +396,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals return -EINVAL; } - priv->txic = mk_ic_value( - gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs), - cvals->tx_max_coalesced_frames); + priv->txic = mk_ic_value(cvals->tx_max_coalesced_frames, + gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs)); gfar_write(&priv->regs->rxic, 0); if (priv->rxcoalescing)