diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2011-09-05 07:41:44 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-09-16 16:50:36 -0400 |
| commit | b548f97684412b0969dc148e1706eb047151e356 (patch) | |
| tree | 94c26c7d961b2d7f0dc9a3c539cf334cdb12628d /drivers/net/ethernet | |
| parent | sfc: Correct error code for unsupported interrupt coalescing parameters (diff) | |
| download | linux-dev-b548f97684412b0969dc148e1706eb047151e356.tar.xz linux-dev-b548f97684412b0969dc148e1706eb047151e356.zip | |
sfc: Use consistent types for interrupt coalescing parameters
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 10 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/ethtool.c | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index b6b0e71f7fc8..097ed8b4a79a 100644 --- 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); diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h index b0d1209ea18d..8f5acae431b9 100644 --- a/drivers/net/ethernet/sfc/efx.h +++ b/drivers/net/ethernet/sfc/efx.h @@ -111,8 +111,8 @@ extern int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok); /* Global */ extern void efx_schedule_reset(struct efx_nic *efx, enum reset_type type); -extern void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, - int rx_usecs, bool rx_adaptive); +extern void efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs, + unsigned int rx_usecs, bool rx_adaptive); /* Dummy PHY ops for PHY drivers */ extern int efx_port_dummy_op_int(struct efx_nic *efx); diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index 6de2715dae18..dedaa2c97e3c 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -625,7 +625,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev, { struct efx_nic *efx = netdev_priv(net_dev); struct efx_channel *channel; - unsigned tx_usecs, rx_usecs, adaptive; + unsigned int tx_usecs, rx_usecs; + bool adaptive; if (coalesce->use_adaptive_tx_coalesce) return -EINVAL; |