diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-03-06 10:33:03 -0800 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2013-03-06 10:33:03 -0800 |
| commit | 2834ce46735cb31d3007d2c0364583f57d2903b1 (patch) | |
| tree | 0885425eafb8579ce1de8227ef22587ae6cb1f68 /lib | |
| parent | 9ae3ef240ab9b68b9e34e8ed88cd4181b742f7a4 (diff) | |
datapath: Remove CAPWAP tunneling support.
The CAPWAP implementation is just the encapsulation format and
therefore really not the full protocol. While there were some
uses of it (primarily hardware support and UDP transport). But
these are most likely better provided by VXLAN.
Following patch removes CAPWAP tunneling support.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dpif-linux.c | 5 | ||||
| -rw-r--r-- | lib/netdev-vport.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index aa1739d0..8ee2bcca 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -439,9 +439,6 @@ get_vport_type(const struct dpif_linux_vport *vport) case OVS_VPORT_TYPE_GRE64: return "gre64"; - case OVS_VPORT_TYPE_CAPWAP: - return "capwap"; - case OVS_VPORT_TYPE_VXLAN: return "vxlan"; @@ -468,8 +465,6 @@ netdev_to_ovs_vport_type(const struct netdev *netdev) return OVS_VPORT_TYPE_GRE64; } else if (strstr(type, "gre")) { return OVS_VPORT_TYPE_GRE; - } else if (!strcmp(type, "capwap")) { - return OVS_VPORT_TYPE_CAPWAP; } else if (!strcmp(type, "vxlan")) { return OVS_VPORT_TYPE_VXLAN; } else { diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index d4a95f58..88817ac1 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -318,10 +318,6 @@ set_tunnel_config(struct netdev_dev *dev_, const struct smap *args) ipsec_mech_set = false; memset(&tnl_cfg, 0, sizeof tnl_cfg); - if (!strcmp(type, "capwap")) { - VLOG_WARN_ONCE("CAPWAP tunnel support is deprecated."); - } - needs_dst_port = !strcmp(type, "vxlan"); tnl_cfg.ipsec = strstr(type, "ipsec"); tnl_cfg.dont_fragment = true; @@ -690,7 +686,6 @@ netdev_vport_tunnel_register(void) TUNNEL_CLASS("ipsec_gre", "gre_system"), TUNNEL_CLASS("gre64", "gre64_system"), TUNNEL_CLASS("ipsec_gre64", "gre64_system"), - TUNNEL_CLASS("capwap", "capwap_system"), TUNNEL_CLASS("vxlan", "vxlan_system") }; |