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
timeval: Remove CACHE_TIME scheme.
[sliver-openvswitch.git]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
f993ba1
..
5e54e0b
100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-548,7
+548,6
@@
bridge_reconfigure_ofp(void)
long long int deadline;
struct bridge *br;
long long int deadline;
struct bridge *br;
- time_refresh();
deadline = time_msec() + OFP_PORT_ACTION_WINDOW;
/* The kernel will reject any attempt to add a given port to a datapath if
deadline = time_msec() + OFP_PORT_ACTION_WINDOW;
/* The kernel will reject any attempt to add a given port to a datapath if
@@
-567,7
+566,6
@@
bridge_reconfigure_ofp(void)
list_remove(&garbage->list_node);
free(garbage);
list_remove(&garbage->list_node);
free(garbage);
- time_refresh();
if (time_msec() >= deadline) {
return false;
}
if (time_msec() >= deadline) {
return false;
}
@@
-580,7
+578,6
@@
bridge_reconfigure_ofp(void)
HMAP_FOR_EACH_SAFE (if_cfg, next, hmap_node, &br->if_cfg_todo) {
iface_create(br, if_cfg, OFPP_NONE);
HMAP_FOR_EACH_SAFE (if_cfg, next, hmap_node, &br->if_cfg_todo) {
iface_create(br, if_cfg, OFPP_NONE);
- time_refresh();
if (time_msec() >= deadline) {
return false;
}
if (time_msec() >= deadline) {
return false;
}