Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6977dc63 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Generate unique names for per-NIC workqueues 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e727149e

drivers/net/sfc/efx.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/sfc/net_driver.h

+2 −0
Original line number Diff line number Diff line
@@ -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;