X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-pltap.c;h=62f23f3fda02321664eb89cb61fc3d3f7085916a;hb=780325b5b8d4c0552b4b7719e0a38200d99f6b08;hp=58273dbcd0c491c5259a3fd4d713ebf456c047e8;hpb=d1673b006d53fdea72c0744e835362ed1917f879;p=sliver-openvswitch.git diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c index 58273dbcd..62f23f3fd 100644 --- a/lib/netdev-pltap.c +++ b/lib/netdev-pltap.c @@ -94,7 +94,7 @@ is_pltap_class(const struct netdev_class *class) static struct netdev_dev_pltap * netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev) { - assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, netdev_dev); } @@ -102,7 +102,7 @@ static struct netdev_pltap * netdev_pltap_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_pltap, netdev); } @@ -363,8 +363,10 @@ static void netdev_pltap_sync_flags(struct netdev_dev_pltap *dev) { - if (dev->fd < 0 || !netdev_pltap_finalized(dev)) + if (dev->fd < 0 || !netdev_pltap_finalized(dev)) { + sync_done(dev); return; + } VLOG_DBG("sync_flags(%s): current: %s %s target: %s %s", dev->real_name,