[ovs-dev] [PATCH v3] netdev: Deprecate CAPWAP support.

[Pravin B Shelar]

v2-v3:
	- Updated changelog
	- Removed warning from kernel datapath.
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 <pshelar at nicira.com>
---
 NEWS                 |    1 +
 debian/changelog     |    1 +
 lib/netdev-vport.c   |    4 ++++
 vswitchd/vswitch.xml |    3 +++
 4 files changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 203a662..53020d1 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ v1.9.0 - xx xxx xxxx
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
         - Tunnel Path MTU Discovery.
+        - CAPWAP tunnel support.
 
 
 v1.8.0 - xx xxx xxxx
diff --git a/debian/changelog b/debian/changelog
index 39673c6..c952e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ openvswitch (1.9.0-1) unstable; urgency=low
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
         - Tunnel Path MTU Discovery.
+        - CAPWAP tunnel support.
 
  -- Open vSwitch team <dev at openvswitch.org>  Wed, 24 Oct 2012 16:10:39 -0700
 
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index ee9cb04..ed20a48 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_ONCE("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 f486d6a..fb452a0 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1222,6 +1222,9 @@
             implemented.  UDP ports 58881 and 58882 are used as the source and
             destination ports respectively.  CAPWAP is currently supported only
             with the Linux kernel datapath with kernel version 2.6.26 or later.
+
+            CAPWAP support is deprecated and will be removed no earlier than
+            February 2013.
           </dd>
 
           <dt><code>patch</code></dt>
-- 
1.7.10