projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Translate queues to priorities correctly.
[openvswitch]
/
ofproto
/
netflow.c
diff --git
a/ofproto/netflow.c
b/ofproto/netflow.c
index 34d571f08c481282266ed8e9019d1c47dde13ccc..67932f0f75d29454bf2c4ff726123b44f8a3d584 100644
(file)
--- a/
ofproto/netflow.c
+++ b/
ofproto/netflow.c
@@
-109,7
+109,7
@@
netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
{
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
{
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
- struct time
val
now;
+ struct time
spec
now;
nf_flow->last_expired += nf->active_timeout;
nf_flow->last_expired += nf->active_timeout;
@@
-120,7
+120,7
@@
netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
return;
}
return;
}
- time_
timeval
(&now);
+ time_
wall_timespec
(&now);
if (!nf->packet.size) {
nf_hdr = ofpbuf_put_zeros(&nf->packet, sizeof *nf_hdr);
if (!nf->packet.size) {
nf_hdr = ofpbuf_put_zeros(&nf->packet, sizeof *nf_hdr);
@@
-128,7
+128,7
@@
netflow_expire(struct netflow *nf, struct netflow_flow *nf_flow,
nf_hdr->count = htons(0);
nf_hdr->sysuptime = htonl(time_msec() - nf->boot_time);
nf_hdr->unix_secs = htonl(now.tv_sec);
nf_hdr->count = htons(0);
nf_hdr->sysuptime = htonl(time_msec() - nf->boot_time);
nf_hdr->unix_secs = htonl(now.tv_sec);
- nf_hdr->unix_nsecs = htonl(now.tv_
usec * 1000
);
+ nf_hdr->unix_nsecs = htonl(now.tv_
nsec
);
nf_hdr->flow_seq = htonl(nf->netflow_cnt++);
nf_hdr->engine_type = nf->engine_type;
nf_hdr->engine_id = nf->engine_id;
nf_hdr->flow_seq = htonl(nf->netflow_cnt++);
nf_hdr->engine_type = nf->engine_type;
nf_hdr->engine_id = nf->engine_id;