Merge "master" into "wdp".

[sliver-openvswitch.git] / ofproto / wdp-xflow.c

diff --git a/ofproto/wdp-xflow.c b/ofproto/wdp-xflow.c
index d1e7c0c..b2208a4 100644 (file)
--- a/ofproto/wdp-xflow.c
+++ b/ofproto/wdp-xflow.c
@@ -231,8 +231,7 @@ wx_rule_update_stats(struct wx *wx, struct wx_rule *rule,
         wx_rule_update_time(wx, rule, stats);
         rule->packet_count += stats->n_packets;
         rule->byte_count += stats->n_bytes;
-        /* XXX netflow_flow_update_flags(&rule->nf_flow, stats->ip_tos,
-           stats->tcp_flags); */
+        /* XXX netflow_flow_update_flags(&rule->nf_flow, stats->tcp_flags); */
     }
 }
 
@@ -1680,10 +1679,6 @@ query_stats(struct wx *wx, struct wx_rule *rule, struct wdp_flow_stats *stats)
             used = xflow_flow_stats_to_msec(&xflow_flow->stats);
             if (used > stats->used) {
                 stats->used = used;
-                if (xflow_flow->key.dl_type == htons(ETH_TYPE_IP)
-                    && xflow_flow->key.nw_proto == IP_TYPE_TCP) {
-                    stats->ip_tos = xflow_flow->stats.ip_tos;
-                }
             }
             stats->tcp_flags |= xflow_flow->stats.tcp_flags;
         }