sfc: Use consistent types for interrupt coalescing parameters

[pandora-kernel.git] / drivers / net / ethernet / sfc / efx.c

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index faca764..097ed8b 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1556,18 +1556,18 @@ static void efx_remove_all(struct efx_nic *efx)
  *
  **************************************************************************/
 
-static unsigned irq_mod_ticks(int usecs, int resolution)
+static unsigned int irq_mod_ticks(unsigned int usecs, unsigned int resolution)
 {
-       if (usecs <= 0)
-               return 0; /* cannot receive interrupts ahead of time :-) */
+       if (usecs == 0)
+               return 0;
        if (usecs < resolution)
                return 1; /* never round down to 0 */
        return usecs / resolution;
 }
 
 /* Set interrupt moderation parameters */
-void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, int rx_usecs,
-                            bool rx_adaptive)
+void efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,
+                            unsigned int rx_usecs, bool rx_adaptive)
 {
        struct efx_channel *channel;
        unsigned tx_ticks = irq_mod_ticks(tx_usecs, EFX_IRQ_MOD_RESOLUTION);
@@ -1903,7 +1903,7 @@ static const struct net_device_ops efx_netdev_ops = {
        .ndo_do_ioctl           = efx_ioctl,
        .ndo_change_mtu         = efx_change_mtu,
        .ndo_set_mac_address    = efx_set_mac_address,
-       .ndo_set_multicast_list = efx_set_multicast_list,
+       .ndo_set_rx_mode        = efx_set_multicast_list,
        .ndo_set_features       = efx_set_features,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller = efx_netpoll,