Commit 4c1dc80a authored by Shreyas Bhatewara's avatar Shreyas Bhatewara Committed by David S. Miller

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: default avatarShreyas N Bhatewara <sbhatewara@vmware.com>
Reviewed-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b471506
...@@ -2704,8 +2704,8 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, ...@@ -2704,8 +2704,8 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
adapter->intr.num_intrs = vectors; adapter->intr.num_intrs = vectors;
return 0; return 0;
} else if (err < 0) { } else if (err < 0) {
printk(KERN_ERR "Failed to enable MSI-X for %s, error" netdev_err(adapter->netdev,
" %d\n", adapter->netdev->name, err); "Failed to enable MSI-X, error: %d\n", err);
vectors = 0; vectors = 0;
} else if (err < vector_threshold) { } else if (err < vector_threshold) {
break; break;
...@@ -2713,15 +2713,15 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, ...@@ -2713,15 +2713,15 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
/* If fails to enable required number of MSI-x vectors /* If fails to enable required number of MSI-x vectors
* try enabling minimum number of vectors required. * 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; 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" netdev_info(adapter->netdev,
" are lower than min threshold required.\n"); "Number of MSI-X interrupts which can be allocated are lower than min threshold required.\n");
return err; return err;
} }
...@@ -2787,8 +2787,9 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) ...@@ -2787,8 +2787,9 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
return; return;
/* If we cannot allocate MSIx vectors use only one rx queue */ /* If we cannot allocate MSIx vectors use only one rx queue */
printk(KERN_INFO "Failed to enable MSI-X for %s, error %d." netdev_info(adapter->netdev,
"#rx queues : 1, try MSI\n", adapter->netdev->name, err); "Failed to enable MSI-X, error %d . Limiting #rx queues to 1, try MSI.\n",
err);
adapter->intr.type = VMXNET3_IT_MSI; adapter->intr.type = VMXNET3_IT_MSI;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment