diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:02:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:02:21 +0200 |
| commit | 94a2597c01a4bd495789e1546374c26b19f6eafd (patch) | |
| tree | 5dd2a82f89a6a8c093d4d6ab7aee22173ff9233e /drivers/net/xen-netfront.c | |
| parent | Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-dev-94a2597c01a4bd495789e1546374c26b19f6eafd.tar.xz linux-dev-94a2597c01a4bd495789e1546374c26b19f6eafd.zip | |
Merge tag 'v3.5-rc5' into next/dt
Linux 3.5-rc5
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) dev_dbg(&dev->dev, "%s\n", dev->nodename); - unregister_netdev(info->netdev); - xennet_disconnect_backend(info); - del_timer_sync(&info->rx_refill_timer); - xennet_sysfs_delif(info->netdev); + unregister_netdev(info->netdev); + + del_timer_sync(&info->rx_refill_timer); + free_percpu(info->stats); free_netdev(info->netdev); |