git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d90c986
)
ofproto: Fix merge error from commit e20567b044.
author
Tom Everman
<teverman@google.com>
Thu, 2 Sep 2010 18:08:53 +0000
(11:08 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 2 Sep 2010 18:12:07 +0000
(11:12 -0700)
ofproto/ofproto.c
patch
|
blob
|
history
diff --git
a/ofproto/ofproto.c
b/ofproto/ofproto.c
index
3c6ba6a
..
3c165c7
100644
(file)
--- 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_flow
s_loose
(p, ofconn, ofm, n_actions);
case OFPFC_MODIFY_STRICT:
return modify_flow_strict(p, ofconn, ofm, n_actions);