v1-v2:
- Added userspace warning.
- Added a NEWS item.
--8<--------------------------cut here-------------------------->8--
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. As a result,
CAPWAP will be removed no earlier than February 2013.
Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
NEWS | 1 +
datapath/vport-capwap.c | 1 +
lib/netdev-vport.c | 4 ++++
vswitchd/vswitch.xml | 3 +++
4 files changed, 9 insertions(+)
diff --git a/NEWS b/NEWS
index fa0a249..99f7c4b 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ v1.9.0 - xx xxx xxxx
- The autopath action.
- Interface type "null".
- Numeric values for reserved ports (see "ovs-ofctl" note above).
+ - CAPWAP tunnel support.
v1.8.0 - xx xxx xxxx
diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index 39aec42..518d5cc 100644
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -473,6 +473,7 @@ static struct vport *capwap_create(const struct vport_parms
*parms)
struct vport *vport;
int err;
+ pr_warn("%s: CAPWAP support is deprecated\n", __func__);
err = init_socket(ovs_dp_get_net(parms->dp));
if (err)
return ERR_PTR(err);
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 4168959..be6dd91 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -590,6 +590,10 @@ parse_tunnel_config(const char *name, const char *type,
ovs_be32 saddr = htonl(0);
uint32_t flags;
+ if (!strcmp(type, "capwap")) {
+ VLOG_WARN("CAPWAP tunnel support is deprecated.");
+ }
+
flags = TNL_F_DF_DEFAULT | TNL_F_HDR_CACHE;
if (!strcmp(type, "gre") || !strcmp(type, "gre64")) {
is_gre = true;
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 0bc4ccd..9510db8 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1216,6 +1216,9 @@
<dt><code>capwap</code></dt>
<dd>
+ As of oct 2012, CAPWAP support is deprecated. will be removed no
+ earlier than February 2013.
+
An Ethernet tunnel over the UDP transport portion of CAPWAP (RFC
5415). This allows interoperability with certain switches that do
not support GRE. Only the tunneling component of the protocol is
--
1.7.10
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
