From dcebc1a62b84ca0594842af51ba13bb5aa335dcd Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 10 Dec 2010 14:03:00 +0000 Subject: [PATCH] --- yaml --- r: 224986 b: refs/heads/master c: 9c1638871671721e8f3693a0dfbb0e2e05b08742 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ba79ac12204a..467e0af9141d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e41f6449c561e6e3f572e11d0f2240bd51104db +refs/heads/master: 9c1638871671721e8f3693a0dfbb0e2e05b08742 diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c index 3ec80684cd5f..b771e4b2ca9e 100644 --- a/trunk/drivers/net/vxge/vxge-main.c +++ b/trunk/drivers/net/vxge/vxge-main.c @@ -3439,11 +3439,11 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev) strncpy(buf, dev->name, IFNAMSIZ); + flush_scheduled_work(); + /* in 2.6 will call stop() if device is up */ unregister_netdev(dev); - flush_scheduled_work(); - vxge_debug_init(vdev->level_trace, "%s: ethernet device unregistered", buf); vxge_debug_entryexit(vdev->level_trace, "%s: %s:%d Exiting...", buf,