diff options
author | Steve Hodgson <shodgson@solarflare.com> | 2008-12-13 00:33:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:56:21 -0500 |
commit | 1ab00629f06fb3c47de6373cd92d086f33775444 (patch) | |
tree | 141cd0599bc92c1911c7c487cc515ec1460908cd /drivers/net/sfc/net_driver.h | |
parent | 65f667fb472d28c1594d862b213a564e292a466c (diff) |
sfc: Make reset_workqueue driver-global rather than per-NIC
Each reset is serialised by the rtnl_lock anyway, so there's no win
per-NIC.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index e596c9a6a4c4..f91060963475 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -635,7 +635,6 @@ union efx_multicast_hash { | |||
635 | * @legacy_irq: IRQ number | 635 | * @legacy_irq: IRQ number |
636 | * @workqueue: Workqueue for port reconfigures and the HW monitor. | 636 | * @workqueue: Workqueue for port reconfigures and the HW monitor. |
637 | * Work items do not hold and must not acquire RTNL. | 637 | * Work items do not hold and must not acquire RTNL. |
638 | * @reset_workqueue: Workqueue for resets. Work item will acquire RTNL. | ||
639 | * @reset_work: Scheduled reset workitem | 638 | * @reset_work: Scheduled reset workitem |
640 | * @monitor_work: Hardware monitor workitem | 639 | * @monitor_work: Hardware monitor workitem |
641 | * @membase_phys: Memory BAR value as physical address | 640 | * @membase_phys: Memory BAR value as physical address |
@@ -711,7 +710,6 @@ struct efx_nic { | |||
711 | const struct efx_nic_type *type; | 710 | const struct efx_nic_type *type; |
712 | int legacy_irq; | 711 | int legacy_irq; |
713 | struct workqueue_struct *workqueue; | 712 | struct workqueue_struct *workqueue; |
714 | struct workqueue_struct *reset_workqueue; | ||
715 | struct work_struct reset_work; | 713 | struct work_struct reset_work; |
716 | struct delayed_work monitor_work; | 714 | struct delayed_work monitor_work; |
717 | resource_size_t membase_phys; | 715 | resource_size_t membase_phys; |