Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus

[pandora-kernel.git] / drivers / net / gianfar_ethtool.c

diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index dbf06e9..2234118 100644 (file)
--- a/drivers/net/gianfar_ethtool.c
+++ b/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)