lkml.org 
[lkml]   [2012]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 082/167] [PATCH] dummy: Add ndo_uninit().
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hiroaki SHIMODA <shimoda.hiroaki@gmail.com>

    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 <shimoda.hiroaki@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/dummy.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
    index d5c6d92..442d91a 100644
    --- a/drivers/net/dummy.c
    +++ b/drivers/net/dummy.c
    @@ -107,14 +107,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,
    @@ -128,7 +128,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;
    --
    1.7.10




    \
     
     \ /
      Last update: 2012-05-09 09:02    [W:0.025 / U:61.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site