[ovs-dev] [PATCH branch-1.7] meta-flow: Fix mf_set_wild() on ip_frag field.

Ben Pfaff blp at nicira.com
Fri Mar 1 16:11:38 UTC 2013


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 at gmail.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 AUTHORS         |    1 +
 lib/meta-flow.c |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d718038..5a5d1e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -160,6 +160,7 @@ YAMAMOTO Takashi        yamamoto at valinux.co.jp
 Yongqiang Liu           liuyq7809 at gmail.com
 kk yap                  yapkke at stanford.edu
 likunyun                kunyunli at hotmail.com
+love you                thunder.love07 at gmail.com
 冯全树(Crab)            fqs888 at 126.com
 胡靖飞                  hujingfei914 at msn.com
 
diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 7a63922..29f0b0d 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:
-- 
1.7.10.4




More information about the dev mailing list