i40e: Add description to misc and fd interrupts
authorCarolyn Wyborny <carolyn.wyborny@intel.com>
Tue, 11 Nov 2014 20:05:26 +0000 (20:05 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 6 Dec 2014 11:40:40 +0000 (03:40 -0800)
This patch adds additional text description for base pf0 and flow director
generated interrupts.  Without this patch, these interrupts are difficult
to distinguish per port on a multi-function device.

Change-ID: I4662e1b38840757765a3fe63d90219d28e76bfab
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 74f378d3fceb5884bb5a1d037bf69357bca97204..2f4be2500660c611c20f0e3b2b29c528d74adb38 100644 (file)
@@ -4870,9 +4870,11 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
                        goto err_set_queues;
 
        } else if (vsi->type == I40E_VSI_FDIR) {
-               snprintf(int_name, sizeof(int_name) - 1, "%s-fdir",
-                        dev_driver_string(&pf->pdev->dev));
+               snprintf(int_name, sizeof(int_name) - 1, "%s-%s-fdir",
+                        dev_driver_string(&pf->pdev->dev),
+                        dev_name(&pf->pdev->dev));
                err = i40e_vsi_request_irq(vsi, int_name);
+
        } else {
                err = -EINVAL;
                goto err_setup_rx;
@@ -9141,9 +9143,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw->aq.arq_buf_size = I40E_MAX_AQ_BUF_SIZE;
        hw->aq.asq_buf_size = I40E_MAX_AQ_BUF_SIZE;
        pf->adminq_work_limit = I40E_AQ_WORK_LIMIT;
+
        snprintf(pf->misc_int_name, sizeof(pf->misc_int_name) - 1,
-                "%s-pf%d:misc",
-                dev_driver_string(&pf->pdev->dev), pf->hw.pf_id);
+                "%s-%s:misc",
+                dev_driver_string(&pf->pdev->dev), dev_name(&pdev->dev));
 
        err = i40e_init_shared_code(hw);
        if (err) {