ofproto: Consistently log OpenFlow error replies.

[openvswitch] / ofproto / netflow.c

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 381ff8efcf23a7a895e48d64e19f8ffb6738e67a..9d9ef19809a7919f661f2dfe34a32726c5ffd79a 100644 (file)
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -104,7 +104,7 @@ struct netflow {
 
 static void
 gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
-                struct ofexpired *expired, 
+                struct ofexpired *expired,
                 uint32_t packet_count, uint32_t byte_count)
 {
     struct netflow_v5_header *nf_hdr;
@@ -160,7 +160,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
     }
     nf_rec->tcp_flags = nf_flow->tcp_flags;
     nf_rec->ip_proto = expired->flow.nw_proto;
-    nf_rec->ip_tos = expired->flow.nw_tos;
+    nf_rec->ip_tos = expired->flow.tos_frag & IP_DSCP_MASK;
 
     /* NetFlow messages are limited to 30 records. */
     if (ntohs(nf_hdr->count) >= 30) {