diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-15 05:03:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-20 06:54:32 +0100 |
| commit | ba27d85c96c57111ae8acfa959643e5ce8e4bcbe (patch) | |
| tree | 3bf910630c93ed9d6fed31f972b1a1953df1137b /drivers/net/vxge | |
| parent | net: increase skb->users instead of skb_clone() (diff) | |
| download | linux-ba27d85c96c57111ae8acfa959643e5ce8e4bcbe.tar.xz linux-ba27d85c96c57111ae8acfa959643e5ce8e4bcbe.zip | |
vxge: add missing flush of reset_task
Commit 6e07ebd84 (drivers/net: remove unnecessary
flush_scheduled_work() calls) incorrectly removed the flush call
without replacing it with the appropriate work specific operation.
Fix it by flushing vdev->reset_task explicitly.
Pointed out by Jon Mason.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jon Mason <jon.mason@exar.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge')
| -rw-r--r-- | drivers/net/vxge/vxge-main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 537ad874f11c..1ac9b568f1b0 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c @@ -3439,6 +3439,8 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev) strncpy(buf, dev->name, IFNAMSIZ); + flush_work_sync(&vdev->reset_task); + /* in 2.6 will call stop() if device is up */ unregister_netdev(dev); |