]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ixgbe: use e_dev_warn instead of netif_printk
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 3 Sep 2014 08:12:54 +0000 (08:12 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 18 Sep 2014 10:28:09 +0000 (03:28 -0700)
The netif_printk relies on our netdevice structure to be registered
already. We may call ixgbe_acquire_msix_vectors prior to registering our
netdevice, so we should not use the netdevice specific printk.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

index 7ecd99c5c5d5d38d2adc003687313f54319f5bd3..5d085d5ed6b75c12e7daea72703c4d3d1df511ba 100644 (file)
@@ -717,12 +717,12 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
                                        vector_threshold, vectors);
 
        if (vectors < 0) {
-               /* Can't allocate enough MSI-X interrupts?  Oh well.
-                * This just means we'll go with either a single MSI
-                * vector or fall back to legacy interrupts.
+               /* A negative count of allocated vectors indicates an error in
+                * acquiring within the specified range of MSI-X vectors
                 */
-               netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
-                            "Unable to allocate MSI-X interrupts\n");
+               e_dev_warn("Failed to allocate MSI-X interrupts. Err: %d\n",
+                          vectors);
+
                adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
                kfree(adapter->msix_entries);
                adapter->msix_entries = NULL;