diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /drivers/net/xen-netfront.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 2027afe405fe..30899901aef5 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1935,14 +1935,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev) | |||
| 1935 | 1935 | ||
| 1936 | dev_dbg(&dev->dev, "%s\n", dev->nodename); | 1936 | dev_dbg(&dev->dev, "%s\n", dev->nodename); |
| 1937 | 1937 | ||
| 1938 | unregister_netdev(info->netdev); | ||
| 1939 | |||
| 1940 | xennet_disconnect_backend(info); | 1938 | xennet_disconnect_backend(info); |
| 1941 | 1939 | ||
| 1942 | del_timer_sync(&info->rx_refill_timer); | ||
| 1943 | |||
| 1944 | xennet_sysfs_delif(info->netdev); | 1940 | xennet_sysfs_delif(info->netdev); |
| 1945 | 1941 | ||
| 1942 | unregister_netdev(info->netdev); | ||
| 1943 | |||
| 1944 | del_timer_sync(&info->rx_refill_timer); | ||
| 1945 | |||
| 1946 | free_percpu(info->stats); | 1946 | free_percpu(info->stats); |
| 1947 | 1947 | ||
| 1948 | free_netdev(info->netdev); | 1948 | free_netdev(info->netdev); |
