X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=6b2e239289556773aaeeb8bb280174ce6e4abcf5;hb=85c9de194b9f432f7b8a66bda980cbab52a55b72;hp=fc5d2de8e18bdfa7e39fdc3c8a99860289030e47;hpb=0d0673857b5b2a50f6aef62e0f042795d9893690;p=sliver-openvswitch.git

diff --git a/datapath/datapath.c b/datapath/datapath.c
index fc5d2de8e..6b2e23928 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -604,7 +604,6 @@ static int validate_set(const struct nlattr *a,
 	int err;
 
 	case OVS_KEY_ATTR_PRIORITY:
-	case OVS_KEY_ATTR_TUN_ID:
 	case OVS_KEY_ATTR_ETHERNET:
 		break;
 
@@ -2316,13 +2315,9 @@ static int __init dp_init(void)
 	if (err)
 		goto error_genl_exec;
 
-	err = ovs_tnl_init();
-	if (err)
-		goto error_wq;
-
 	err = ovs_flow_init();
 	if (err)
-		goto error_tnl_exit;
+		goto error_wq;
 
 	err = ovs_vport_init();
 	if (err)
@@ -2352,8 +2347,6 @@ error_vport_exit:
 	ovs_vport_exit();
 error_flow_exit:
 	ovs_flow_exit();
-error_tnl_exit:
-	ovs_tnl_exit();
 error_wq:
 	ovs_workqueues_exit();
 error_genl_exec:
@@ -2371,7 +2364,6 @@ static void dp_cleanup(void)
 	rcu_barrier();
 	ovs_vport_exit();
 	ovs_flow_exit();
-	ovs_tnl_exit();
 	ovs_workqueues_exit();
 	genl_exec_exit();
 }