X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=78712c6a9603e524423c8137514f263287ca196a;hb=0c58c0c4da31b554e88be581cca39d314ded9b6b;hp=ed61039a0a3d6dee88d762ea62934ce95dcf2e67;hpb=5b95ab0edf18e44d6624c8aa98b658df2fbb48f2;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index ed61039a..78712c6a 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: