Skip to content

Commit 91bdefe

Browse files
Ian Campbellbwhacks
Ian Campbell
authored andcommitted
xen/netfront: teardown the device before unregistering it.
commit 6bc96d0 upstream. Fixes: [ 15.470311] WARNING: at /local/scratch/ianc/devel/kernels/linux/fs/sysfs/file.c:498 sysfs_attr_ns+0x95/0xa0() [ 15.470326] sysfs: kobject eth0 without dirent [ 15.470333] Modules linked in: [ 15.470342] Pid: 12, comm: xenwatch Not tainted 3.4.0-x86_32p-xenU torvalds#93 and [ 9.150554] BUG: unable to handle kernel paging request at 2b359000 [ 9.150577] IP: [<c1279561>] linkwatch_do_dev+0x81/0xc0 [ 9.150592] *pdpt = 000000002c3c9027 *pde = 0000000000000000 [ 9.150604] Oops: 0002 [#1] SMP [ 9.150613] Modules linked in: This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675190 Reported-by: George Shuklin <george.shuklin@gmail.com> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Tested-by: William Dauchy <wdauchy@gmail.com> Cc: 675190@bugs.debian.org Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
1 parent dd97160 commit 91bdefe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/xen-netfront.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1922,14 +1922,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
19221922

19231923
dev_dbg(&dev->dev, "%s\n", dev->nodename);
19241924

1925-
unregister_netdev(info->netdev);
1926-
19271925
xennet_disconnect_backend(info);
19281926

1929-
del_timer_sync(&info->rx_refill_timer);
1930-
19311927
xennet_sysfs_delif(info->netdev);
19321928

1929+
unregister_netdev(info->netdev);
1930+
1931+
del_timer_sync(&info->rx_refill_timer);
1932+
19331933
free_percpu(info->stats);
19341934

19351935
free_netdev(info->netdev);

0 commit comments

Comments
 (0)