sfc: Generate unique names for per-NIC workqueues

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 42934ba2030d9d08d8c1b0ec987c932de298b1c4..46c2a8b0a88d9fdc34661eb35955163f8250027b 100644 (file)
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1929,7 +1929,10 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
        efx->interrupt_mode = max(efx->type->max_interrupt_mode,
                                  interrupt_mode);
 
-       efx->workqueue = create_singlethread_workqueue("sfc_work");
+       /* Would be good to use the net_dev name, but we're too early */
+       snprintf(efx->workqueue_name, sizeof(efx->workqueue_name), "sfc%s",
+                pci_name(pci_dev));
+       efx->workqueue = create_singlethread_workqueue(efx->workqueue_name);
        if (!efx->workqueue)
                return -ENOMEM;
 

diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 03feaee04acd452ad5119de084e8521629de3d7b..b0c79755ef2fb09f9a57f31e2e5d2df658a6d6ef 100644 (file)
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -700,6 +700,7 @@ union efx_multicast_hash {
  * @legacy_irq: IRQ number
  * @workqueue: Workqueue for port reconfigures and the HW monitor.
  *     Work items do not hold and must not acquire RTNL.
+ * @workqueue_name: Name of workqueue
  * @reset_work: Scheduled reset workitem
  * @monitor_work: Hardware monitor workitem
  * @membase_phys: Memory BAR value as physical address
@@ -781,6 +782,7 @@ struct efx_nic {
        const struct efx_nic_type *type;
        int legacy_irq;
        struct workqueue_struct *workqueue;
+       char workqueue_name[16];
        struct work_struct reset_work;
        struct delayed_work monitor_work;
        resource_size_t membase_phys;