X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=ab43772af96d8c47a9750b63a9a31fdd3833415c;hb=f31282b9c152d5e993c8fe0068b7a4ed8c8d98c8;hp=6aa4084b25e26094f51b9a013bda3901230db41e;hpb=95d4ec339d25373e04e5218235d3d0d477f0766e;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 6aa4084b2..ab43772af 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ is_dummy_class(const struct netdev_class *class) static struct netdev_dev_dummy * netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev) { - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev); } @@ -81,7 +81,7 @@ static struct netdev_dummy * netdev_dummy_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_dummy, netdev); } @@ -319,6 +319,7 @@ static const struct netdev_class dummy_class = { netdev_dummy_destroy, NULL, /* get_config */ NULL, /* set_config */ + NULL, /* get_tunnel_config */ netdev_dummy_open, netdev_dummy_close, @@ -362,7 +363,7 @@ static const struct netdev_class dummy_class = { NULL, /* get_in6 */ NULL, /* add_router */ NULL, /* get_next_hop */ - NULL, /* get_drv_info */ + NULL, /* get_status */ NULL, /* arp_lookup */ netdev_dummy_update_flags,