X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Factions.c;h=78712c6a9603e524423c8137514f263287ca196a;hb=b85d8d61a6c3b9c2fa578fa62c795a93544764af;hp=ed61039a0a3d6dee88d762ea62934ce95dcf2e67;hpb=79b8c1edcb52286c8f62e0f7350b1817f82815ac;p=sliver-openvswitch.git

diff --git a/datapath/actions.c b/datapath/actions.c
index ed61039a0..78712c6a9 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -218,7 +218,7 @@ error:
 	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;
 
@@ -262,8 +262,8 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 			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: