X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-vport.c;h=9e92a882878caee5dfd02d07ce93d3c158dd1038;hb=cfc50ae514f805dcd9c14589f21158185424daf6;hp=165c1c66164c0440d7af2257c28b602cc15c548d;hpb=da4a619179d6d6e9e6a82977c41cfcc2d1533ad8;p=sliver-openvswitch.git diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 165c1c661..9e92a8828 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -25,7 +25,6 @@ #include #include "byte-order.h" -#include "connectivity.h" #include "daemon.h" #include "dirs.h" #include "dpif.h" @@ -36,7 +35,6 @@ #include "ofpbuf.h" #include "packets.h" #include "route-table.h" -#include "seq.h" #include "shash.h" #include "socket-util.h" #include "vlog.h" @@ -212,7 +210,7 @@ netdev_vport_set_etheraddr(struct netdev *netdev_, ovs_mutex_lock(&netdev->mutex); memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN); ovs_mutex_unlock(&netdev->mutex); - seq_change(connectivity_seq_get()); + netdev_change_seq_changed(netdev_); return 0; } @@ -433,6 +431,7 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args) static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER; static pid_t pid = 0; +#ifndef _WIN32 ovs_mutex_lock(&mutex); if (pid <= 0) { char *file_name = xasprintf("%s/%s", ovs_rundir(), @@ -441,6 +440,7 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args) free(file_name); } ovs_mutex_unlock(&mutex); +#endif if (pid < 0) { VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon", @@ -484,7 +484,7 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args) ovs_mutex_lock(&dev->mutex); dev->tnl_cfg = tnl_cfg; - seq_change(connectivity_seq_get()); + netdev_change_seq_changed(dev_); ovs_mutex_unlock(&dev->mutex); return 0; @@ -658,7 +658,7 @@ set_patch_config(struct netdev *dev_, const struct smap *args) ovs_mutex_lock(&dev->mutex); free(dev->peer); dev->peer = xstrdup(peer); - seq_change(connectivity_seq_get()); + netdev_change_seq_changed(dev_); ovs_mutex_unlock(&dev->mutex); return 0;