X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=3d9cd85fb2b4488babf963898b920adc81ef5381;hb=cb22974d773942d66da42b700b8bca0db27a0920;hp=682dfc90a5ff21bee242e21d4fd6669dcad5cdea;hpb=4749f73d12c844b318af7f45cf45e1acac9f7c08;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 682dfc90a..3d9cd85fb 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -17,7 +17,6 @@ #include #include "dpif.h" -#include #include #include #include @@ -160,7 +159,7 @@ static void dp_netdev_execute_actions(struct dp_netdev *, static struct dpif_netdev * dpif_netdev_cast(const struct dpif *dpif) { - assert(dpif->dpif_class->open == dpif_netdev_open); + ovs_assert(dpif->dpif_class->open == dpif_netdev_open); return CONTAINER_OF(dpif, struct dpif_netdev, dpif); } @@ -289,7 +288,7 @@ dpif_netdev_open(const struct dpif_class *class, const char *name, if (error) { return error; } - assert(dp != NULL); + ovs_assert(dp != NULL); } } else { if (dp->class != class) { @@ -337,7 +336,7 @@ static void dpif_netdev_close(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - assert(dp->open_cnt > 0); + ovs_assert(dp->open_cnt > 0); if (--dp->open_cnt == 0 && dp->destroyed) { shash_find_and_delete(&dp_netdevs, dp->name); dp_netdev_free(dp);