|
@@ -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;
|
|
|
}
|