git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Datapath action should not refer to controller
[sliver-openvswitch.git]
/
datapath
/
actions.c
diff --git
a/datapath/actions.c
b/datapath/actions.c
index
ed61039
..
78712c6
100644
(file)
--- a/
datapath/actions.c
+++ b/
datapath/actions.c
@@
-218,7
+218,7
@@
error:
kfree_skb(skb);
}
kfree_skb(skb);
}
-static int output_
control
(struct datapath *dp, struct sk_buff *skb, u64 arg)
+static int output_
userspace
(struct datapath *dp, struct sk_buff *skb, u64 arg)
{
struct dp_upcall_info upcall;
{
struct dp_upcall_info upcall;
@@
-262,8
+262,8
@@
static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
prev_port = nla_get_u32(a);
break;
prev_port = nla_get_u32(a);
break;
- case ODP_ACTION_ATTR_
CONTROLLER
:
- err = output_
control
(dp, skb, nla_get_u64(a));
+ case ODP_ACTION_ATTR_
USERSPACE
:
+ err = output_
userspace
(dp, skb, nla_get_u64(a));
break;
case ODP_ACTION_ATTR_SET_TUNNEL:
break;
case ODP_ACTION_ATTR_SET_TUNNEL: