summaryrefslogtreecommitdiff
path: root/ofproto/netflow.c
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2013-12-06 18:53:12 -0800
committerEthan Jackson <ethan@nicira.com>2013-12-13 09:35:00 -0800
commitd8d9c698b853d67fcf55cb0e8c57cc8fbcdfe0d9 (patch)
treecd6053c62af7f27c004f71fe9acbd74193e797f7 /ofproto/netflow.c
parentbca43eff7ded606cbebb89f1ba78f14694cf3a6d (diff)
downloadopenvswitch-d8d9c698b853d67fcf55cb0e8c57cc8fbcdfe0d9.tar.gz
flow: New function flow_unwildcard_tp_ports().
This patch adds a new function flow_unildcard_tp_ports() which doesn't unwildcard the upper half of tp_src and tp_dst with ICMP packets. Unfortunately, this matters in future patches when we compare masks carefully to determine if flows should be evicted from the datapath. Signed-off-by: Ethan Jackson <ethan@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ofproto/netflow.c')
-rw-r--r--ofproto/netflow.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 7b9e0e6c2..f79ad6ad0 100644
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -98,8 +98,7 @@ netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
- memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
- memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
+ flow_unwildcard_tp_ports(flow, wc);
wc->masks.nw_tos |= IP_DSCP_MASK;
}