Skip to content

Commit

Permalink
vmxnet3: Fix log messages and corrects some typos
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shreyas Bhatewara authored and David S. Miller committed Mar 5, 2012
1 parent 0b47150 commit 4c1dc80
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/net/vmxnet3/vmxnet3_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -2704,24 +2704,24 @@ 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;
} else {
/* 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;
}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4c1dc80

Please sign in to comment.