summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-03-01 08:11:38 -0800
committerBen Pfaff <blp@nicira.com>2013-03-12 12:32:26 -0700
commite27ab068499dd4329db8b60ad2e60ea511ef5200 (patch)
tree920afad043990730e575ffe8c4fd0eca5535e163
parent9e3b82aeb290ee9583b709185778fc579a020780 (diff)
downloadopenvswitch-e27ab068499dd4329db8b60ad2e60ea511ef5200.tar.gz
meta-flow: Fix mf_set_wild() on ip_frag field.
Fixes behavior of utilities/ovs-ofctl parse-flow 'ip,ip_frag=any,actions=drop' and other cases that invoke this function on the ip_frag field. Reported-by: love you <thunder.love07@gmail.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--AUTHORS1
-rw-r--r--lib/meta-flow.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index d7180386d..5a5d1e6d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -160,6 +160,7 @@ YAMAMOTO Takashi yamamoto@valinux.co.jp
Yongqiang Liu liuyq7809@gmail.com
kk yap yapkke@stanford.edu
likunyun kunyunli@hotmail.com
+love you thunder.love07@gmail.com
冯全树(Crab) fqs888@126.com
胡靖飞 hujingfei914@msn.com
diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 7a639223c..29f0b0dce 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1604,8 +1604,8 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule)
break;
case MFF_IP_FRAG:
- rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK;
- rule->flow.nw_frag &= ~FLOW_NW_FRAG_MASK;
+ rule->wc.nw_frag_mask = 0;
+ rule->flow.nw_frag = 0;
break;
case MFF_ARP_OP: