Skip to content

Commit 6bc96d0

Browse files
Ian Campbelldavem330
Ian Campbell
authored andcommitted
xen/netfront: teardown the device before unregistering it.
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 raspberrypi#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 <[email protected]> Signed-off-by: Ian Campbell <[email protected]> Tested-by: William Dauchy <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: David S. Miller <[email protected]>
1 parent 149ddd8 commit 6bc96d0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/xen-netfront.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,14 +1935,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
19351935

19361936
dev_dbg(&dev->dev, "%s\n", dev->nodename);
19371937

1938-
unregister_netdev(info->netdev);
1939-
19401938
xennet_disconnect_backend(info);
19411939

1942-
del_timer_sync(&info->rx_refill_timer);
1943-
19441940
xennet_sysfs_delif(info->netdev);
19451941

1942+
unregister_netdev(info->netdev);
1943+
1944+
del_timer_sync(&info->rx_refill_timer);
1945+
19461946
free_percpu(info->stats);
19471947

19481948
free_netdev(info->netdev);

0 commit comments

Comments
 (0)