diff options
| author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2012-02-28 22:08:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-04 21:37:51 -0500 |
| commit | 4c1dc80a74384829e467ba078260094d1ffdd963 (patch) | |
| tree | fcfa62d7d1f13f46d0f56efa89b31514ef28307a /drivers/net | |
| parent | 0b471506712dd734964b3270d2aa88160712c262 (diff) | |
| download | linux-3.10-4c1dc80a74384829e467ba078260094d1ffdd963.tar.gz linux-3.10-4c1dc80a74384829e467ba078260094d1ffdd963.tar.bz2 linux-3.10-4c1dc80a74384829e467ba078260094d1ffdd963.zip | |
vmxnet3: Fix log messages and corrects some typos
Fix log messages and corrects some typos
Change logging of failure to enable MSI/MSI-X to display device's PCI
address instead of eth%d. Rectify a typo.
Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Reviewed-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index adf527e2758..a9684a53af1 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2704,8 +2704,8 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, adapter->intr.num_intrs = vectors; return 0; } else if (err < 0) { - printk(KERN_ERR "Failed to enable MSI-X for %s, error" - " %d\n", adapter->netdev->name, err); + netdev_err(adapter->netdev, + "Failed to enable MSI-X, error: %d\n", err); vectors = 0; } else if (err < vector_threshold) { break; @@ -2713,15 +2713,15 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, /* If fails to enable required number of MSI-x vectors * try enabling minimum number of vectors required. */ + netdev_err(adapter->netdev, + "Failed to enable %d MSI-X, trying %d instead\n", + vectors, vector_threshold); vectors = vector_threshold; - printk(KERN_ERR "Failed to enable %d MSI-X for %s, try" - " %d instead\n", vectors, adapter->netdev->name, - vector_threshold); } } - printk(KERN_INFO "Number of MSI-X interrupts which can be allocatedi" - " are lower than min threshold required.\n"); + netdev_info(adapter->netdev, + "Number of MSI-X interrupts which can be allocated are lower than min threshold required.\n"); return err; } @@ -2787,8 +2787,9 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) return; /* If we cannot allocate MSIx vectors use only one rx queue */ - printk(KERN_INFO "Failed to enable MSI-X for %s, error %d." - "#rx queues : 1, try MSI\n", adapter->netdev->name, err); + netdev_info(adapter->netdev, + "Failed to enable MSI-X, error %d . Limiting #rx queues to 1, try MSI.\n", + err); adapter->intr.type = VMXNET3_IT_MSI; } |