git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
classifier: Use array for subtables instead of a list.
[sliver-openvswitch.git]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index
165c1c6
..
9e92a88
100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-25,7
+25,6
@@
#include <sys/ioctl.h>
#include "byte-order.h"
#include <sys/ioctl.h>
#include "byte-order.h"
-#include "connectivity.h"
#include "daemon.h"
#include "dirs.h"
#include "dpif.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 "ofpbuf.h"
#include "packets.h"
#include "route-table.h"
-#include "seq.h"
#include "shash.h"
#include "socket-util.h"
#include "vlog.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);
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;
}
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;
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(),
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);
free(file_name);
}
ovs_mutex_unlock(&mutex);
+#endif
if (pid < 0) {
VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",
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;
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;
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);
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;
ovs_mutex_unlock(&dev->mutex);
return 0;