projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Avoid errors from ovs-vsctl at system shutdown.
[openvswitch]
/
ofproto
/
ofproto-sflow.c
diff --git
a/ofproto/ofproto-sflow.c
b/ofproto/ofproto-sflow.c
index 37c1bb7f457a7ec0da1cab05a43bb15dc8cbe94f..cc6a6935a0538d5695c7d323215064bded243a98 100644
(file)
--- a/
ofproto/ofproto-sflow.c
+++ b/
ofproto/ofproto-sflow.c
@@
-354,7
+354,7
@@
ofproto_sflow_del_port(struct ofproto_sflow *os, uint16_t odp_port)
}
netdev_close(osp->netdev);
free(osp);
}
netdev_close(osp->netdev);
free(osp);
- port_array_
set(&os->ports, odp_port, NULL
);
+ port_array_
delete(&os->ports, odp_port
);
}
}
}
}
@@
-415,7
+415,7
@@
ofproto_sflow_set_options(struct ofproto_sflow *os,
sfl_agent_release(os->sflow_agent);
}
os->sflow_agent = xcalloc(1, sizeof *os->sflow_agent);
sfl_agent_release(os->sflow_agent);
}
os->sflow_agent = xcalloc(1, sizeof *os->sflow_agent);
- now = time_
now
();
+ now = time_
wall
();
sfl_agent_init(os->sflow_agent,
&agentIP,
options->sub_id,
sfl_agent_init(os->sflow_agent,
&agentIP,
options->sub_id,
@@
-597,7
+597,7
@@
ofproto_sflow_run(struct ofproto_sflow *os)
if (ofproto_sflow_is_enabled(os)) {
time_t now = time_now();
if (now >= os->next_tick) {
if (ofproto_sflow_is_enabled(os)) {
time_t now = time_now();
if (now >= os->next_tick) {
- sfl_agent_tick(os->sflow_agent,
now
);
+ sfl_agent_tick(os->sflow_agent,
time_wall()
);
os->next_tick = now + 1;
}
}
os->next_tick = now + 1;
}
}