From: Hiroaki SHIMODA Date: Sun, 15 Apr 2012 13:26:01 +0000 (+0000) Subject: dummy: Add ndo_uninit(). X-Git-Tag: v3.2.17~86 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=829a94ac60173dca2a30b65ea43c5c01150bd233 dummy: Add ndo_uninit(). commit 890fdf2a0cb88202d1427589db2cf29c1bdd3c1d upstream. In register_netdevice(), when ndo_init() is successful and later some error occurred, ndo_uninit() will be called. So dummy deivce is desirable to implement ndo_uninit() method to free percpu stats for this case. And, ndo_uninit() is also called along with dev->destructor() when device is unregistered, so in order to prevent dev->dstats from being freed twice, dev->destructor is modified to free_netdev(). Signed-off-by: Hiroaki SHIMODA Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index a7c5e8831e8c..eeac9caab649 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c @@ -106,14 +106,14 @@ static int dummy_dev_init(struct net_device *dev) return 0; } -static void dummy_dev_free(struct net_device *dev) +static void dummy_dev_uninit(struct net_device *dev) { free_percpu(dev->dstats); - free_netdev(dev); } static const struct net_device_ops dummy_netdev_ops = { .ndo_init = dummy_dev_init, + .ndo_uninit = dummy_dev_uninit, .ndo_start_xmit = dummy_xmit, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = set_multicast_list, @@ -127,7 +127,7 @@ static void dummy_setup(struct net_device *dev) /* Initialize the device structure. */ dev->netdev_ops = &dummy_netdev_ops; - dev->destructor = dummy_dev_free; + dev->destructor = free_netdev; /* Fill in device structure with ethernet-generic values. */ dev->tx_queue_len = 0;