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
Tunnel: Cleanup old tunnel infrastructure.
[sliver-openvswitch.git]
/
datapath
/
datapath.c
diff --git
a/datapath/datapath.c
b/datapath/datapath.c
index
fc5d2de
..
6b2e239
100644
(file)
--- 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:
int err;
case OVS_KEY_ATTR_PRIORITY:
- case OVS_KEY_ATTR_TUN_ID:
case OVS_KEY_ATTR_ETHERNET:
break;
case OVS_KEY_ATTR_ETHERNET:
break;
@@
-2316,13
+2315,9
@@
static int __init dp_init(void)
if (err)
goto error_genl_exec;
if (err)
goto error_genl_exec;
- err = ovs_tnl_init();
- if (err)
- goto error_wq;
-
err = ovs_flow_init();
if (err)
err = ovs_flow_init();
if (err)
- goto error_
tnl_exit
;
+ goto error_
wq
;
err = ovs_vport_init();
if (err)
err = ovs_vport_init();
if (err)
@@
-2352,8
+2347,6
@@
error_vport_exit:
ovs_vport_exit();
error_flow_exit:
ovs_flow_exit();
ovs_vport_exit();
error_flow_exit:
ovs_flow_exit();
-error_tnl_exit:
- ovs_tnl_exit();
error_wq:
ovs_workqueues_exit();
error_genl_exec:
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();
rcu_barrier();
ovs_vport_exit();
ovs_flow_exit();
- ovs_tnl_exit();
ovs_workqueues_exit();
genl_exec_exit();
}
ovs_workqueues_exit();
genl_exec_exit();
}