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
Merge commit 'origin/citrix'
[sliver-openvswitch.git]
/
ofproto
/
netflow.c
diff --git
a/ofproto/netflow.c
b/ofproto/netflow.c
index
7dd2e04
..
7912b4b
100644
(file)
--- a/
ofproto/netflow.c
+++ b/
ofproto/netflow.c
@@
-221,9
+221,8
@@
netflow_expire(struct netflow *nf, const struct ofexpired *expired)
nf_rec->ip_proto = expired->flow.nw_proto;
nf_rec->ip_tos = expired->ip_tos;
nf_rec->ip_proto = expired->flow.nw_proto;
nf_rec->ip_tos = expired->ip_tos;
- /* NetFlow messages are limited to 30 records. A length of 1400
- * bytes guarantees that the limit is not exceeded. */
- if (nf->packet.size >= 1400) {
+ /* NetFlow messages are limited to 30 records. */
+ if (ntohs(nf_hdr->count) >= 30) {
netflow_run(nf);
}
}
netflow_run(nf);
}
}