From 4595b82944bbdb511fad8225ccffab1a616ea94e Mon Sep 17 00:00:00 2001 From: Jiajun Wu Date: Thu, 30 Jul 2009 14:20:42 -0700 Subject: [PATCH] --- yaml --- r: 156335 b: refs/heads/master c: accff95c2500c7bce671c1f722de6f8810fe550d h: refs/heads/master i: 156333: 3a75a0d4991558d32f7dc662df5a65a50b43eaa0 156331: 979b83c4af824399457909cfda96a763d23fb047 156327: a8cb6e0ac06ce86791d053c06ed9333ca1c8650e 156319: d18afc014fa9552336a5a0503e2f4ead991ef9fa v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar_ethtool.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3b7fd65c5c5f..2cd20c578b17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72fc939789dbe7ca091b50b686d45ac0df15417a +refs/heads/master: accff95c2500c7bce671c1f722de6f8810fe550d diff --git a/trunk/drivers/net/gianfar_ethtool.c b/trunk/drivers/net/gianfar_ethtool.c index dbf06e9313cc..2234118eedbb 100644 --- a/trunk/drivers/net/gianfar_ethtool.c +++ b/trunk/drivers/net/gianfar_ethtool.c @@ -366,9 +366,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) || @@ -390,9 +389,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)