ovsdb-idl: log error in client when db schema does not exist on server

[cascardo/ovs.git] / lib / vlandev.c

diff --git a/lib/vlandev.c b/lib/vlandev.c
index 382487c..d2a3191 100644 (file)
--- a/lib/vlandev.c
+++ b/lib/vlandev.c
@@ -27,7 +27,7 @@
 #include "hash.h"
 #include "shash.h"
 #include "socket-util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(vlandev);
 
@@ -162,7 +162,7 @@ vlandev_get_name(const char *real_dev_name, int vid)
 /* The Linux vlandev implementation. */
 
 #ifdef __linux__
-#include "rtnetlink-link.h"
+#include "rtnetlink.h"
 #include <linux/if_vlan.h>
 #include <linux/sockios.h>
 #include "netdev-linux.h"
@@ -171,7 +171,7 @@ static struct nln_notifier *vlan_cache_notifier;
 static bool cache_valid;
 
 static void
-vlan_cache_cb(const struct rtnetlink_link_change *change OVS_UNUSED,
+vlan_cache_cb(const struct rtnetlink_change *change OVS_UNUSED,
               void *aux OVS_UNUSED)
 {
     cache_valid = false;
@@ -185,8 +185,8 @@ vlandev_linux_refresh(void)
     FILE *stream;
 
     if (!vlan_cache_notifier) {
-        vlan_cache_notifier = rtnetlink_link_notifier_create(vlan_cache_cb,
-                                                             NULL);
+        vlan_cache_notifier = rtnetlink_notifier_create(vlan_cache_cb,
+                                                        NULL);
         if (!vlan_cache_notifier) {
             return EINVAL;
         }
@@ -374,7 +374,7 @@ static int
 vlandev_del__(const char *vlan_dev)
 {
     struct shash_node *vd_node = shash_find(&vlan_devs, vlan_dev);
-    if (!vd_node) {
+    if (vd_node) {
         struct vlan_dev *vd = vd_node->data;
         struct vlan_real_dev *vrd = vd->real_dev;