From 37b485896684930b8cfdd31dd852d3011297523c Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Wed, 20 Jul 2011 03:56:02 +0000 Subject: [PATCH] --- yaml --- r: 256609 b: refs/heads/master c: 2e66f55b3afa290337a47e6ea134ac071c5dd9a7 h: refs/heads/master i: 256607: 9a254c668262db6283a59a0deb00d50118e81932 v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 30d6fa1282b9..226ba3c5293a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87c48fa3b4630905f98268dde838ee43626a060c +refs/heads/master: 2e66f55b3afa290337a47e6ea134ac071c5dd9a7 diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index fbea637eb742..0c7321c35ad4 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -705,14 +705,6 @@ static void virtnet_netpoll(struct net_device *dev) } #endif -static void virtnet_free(struct net_device *dev) -{ - struct virtnet_info *vi = netdev_priv(dev); - - free_percpu(vi->stats); - free_netdev(dev); -} - static int virtnet_open(struct net_device *dev) { struct virtnet_info *vi = netdev_priv(dev); @@ -959,7 +951,6 @@ static int virtnet_probe(struct virtio_device *vdev) /* Set up network device as normal. */ dev->netdev_ops = &virtnet_netdev; dev->features = NETIF_F_HIGHDMA; - dev->destructor = virtnet_free; SET_ETHTOOL_OPS(dev, &virtnet_ethtool_ops); SET_NETDEV_DEV(dev, &vdev->dev); @@ -1122,6 +1113,7 @@ static void __devexit virtnet_remove(struct virtio_device *vdev) while (vi->pages) __free_pages(get_a_page(vi, GFP_KERNEL), 0); + free_percpu(vi->stats); free_netdev(vi->dev); }