From 3079a54a3bd17f9721a7aee2718002cba6cc9d6e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 26 Dec 2008 13:44:39 -0800 Subject: [PATCH] --- yaml --- r: 122942 b: refs/heads/master c: 6977dc6309ea8bbcb24c0a1356c33969e4a07410 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 5 ++++- trunk/drivers/net/sfc/net_driver.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0f7cf070325..a9c38e91f93a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e727149e26b08550269a7786fda977aed65578f6 +refs/heads/master: 6977dc6309ea8bbcb24c0a1356c33969e4a07410 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index 42934ba2030d..46c2a8b0a88d 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/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/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h index 03feaee04acd..b0c79755ef2f 100644 --- a/trunk/drivers/net/sfc/net_driver.h +++ b/trunk/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;