From: Tom Everman <teverman@google.com>
Date: Thu, 2 Sep 2010 18:08:53 +0000 (-0700)
Subject: ofproto: Fix merge error from commit e20567b044.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e9ec7451755a50449811738b5a0adad49a864fe3;p=sliver-openvswitch.git

ofproto: Fix merge error from commit e20567b044.
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 3c6ba6a83..3c165c71b 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2434,10 +2434,10 @@ handle_flow_mod(struct ofproto *p, struct ofconn *ofconn,
 
     switch (ntohs(ofm->command) & 0xff) {
     case OFPFC_ADD:
-        return modify_flows_loose(p, ofconn, ofm, n_actions);
+        return add_flow(p, ofconn, ofm, n_actions);
 
     case OFPFC_MODIFY:
-        return modify_flow_strict(p, ofconn, ofm, n_actions);
+        return modify_flows_loose(p, ofconn, ofm, n_actions);
 
     case OFPFC_MODIFY_STRICT:
         return modify_flow_strict(p, ofconn, ofm, n_actions);