diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-14 00:40:12 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-16 00:25:09 +0000 |
| commit | a16e5b246c5b1aff3141ca6ae443307f3241a133 (patch) | |
| tree | 434fa46e6b0a8ee933cde9f61630576e424201ef /drivers/net/ethernet/sfc | |
| parent | 5bbe2f4f64cc7f6da6390035dcfc42b14bd80484 (diff) | |
| download | blackbird-op-linux-a16e5b246c5b1aff3141ca6ae443307f3241a133.tar.gz blackbird-op-linux-a16e5b246c5b1aff3141ca6ae443307f3241a133.zip | |
sfc: Make all CPU/IRQ/channel/queue counts unsigned
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 18 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index eda2272bc4c0..3a103f8972e7 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -1104,10 +1104,10 @@ static void efx_fini_io(struct efx_nic *efx) pci_disable_device(efx->pci_dev); } -static int efx_wanted_parallelism(void) +static unsigned int efx_wanted_parallelism(void) { cpumask_var_t thread_mask; - int count; + unsigned int count; int cpu; if (rss_cpus) @@ -1136,7 +1136,8 @@ static int efx_init_rx_cpu_rmap(struct efx_nic *efx, struct msix_entry *xentries) { #ifdef CONFIG_RFS_ACCEL - int i, rc; + unsigned int i; + int rc; efx->net_dev->rx_cpu_rmap = alloc_irq_cpu_rmap(efx->n_rx_channels); if (!efx->net_dev->rx_cpu_rmap) @@ -1159,13 +1160,14 @@ efx_init_rx_cpu_rmap(struct efx_nic *efx, struct msix_entry *xentries) */ static int efx_probe_interrupts(struct efx_nic *efx) { - int max_channels = - min_t(int, efx->type->phys_addr_channels, EFX_MAX_CHANNELS); - int rc, i; + unsigned int max_channels = + min(efx->type->phys_addr_channels, EFX_MAX_CHANNELS); + unsigned int i; + int rc; if (efx->interrupt_mode == EFX_INT_MODE_MSIX) { struct msix_entry xentries[EFX_MAX_CHANNELS]; - int n_channels; + unsigned int n_channels; n_channels = efx_wanted_parallelism(); if (separate_tx_channels) @@ -1178,7 +1180,7 @@ static int efx_probe_interrupts(struct efx_nic *efx) if (rc > 0) { netif_err(efx, drv, efx->net_dev, "WARNING: Insufficient MSI-X vectors" - " available (%d < %d).\n", rc, n_channels); + " available (%d < %u).\n", rc, n_channels); netif_err(efx, drv, efx->net_dev, "WARNING: Performance may be reduced.\n"); EFX_BUG_ON_PARANOID(rc >= n_channels); diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 59c0583182a5..3260e7137918 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -52,7 +52,7 @@ * **************************************************************************/ -#define EFX_MAX_CHANNELS 32 +#define EFX_MAX_CHANNELS 32U #define EFX_MAX_RX_QUEUES EFX_MAX_CHANNELS /* Checksum generation is a per-queue option in hardware, so each |
