netdev: Deprecate CAPWAP 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.  As a result,
CAPWAP will be removed no earlier than February 2013.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>

diff --git a/NEWS b/NEWS
index a9b9a496b83d52374bc7da45bd22be848e1d3ed4..b2360cfa18fd52521e566e017fcdbcdcbfaba460 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,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.
     - The data in the RARP packets can now be matched in the same way as the
       data in ARP packets.
 

diff --git a/debian/changelog b/debian/changelog
index 237cf71517fddd1104d28233109698d4cdcba6f2..113a0e28baee5eff6d095fb04fca5caa5750ead4 100644 (file)
--- 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.
     - The data in the RARP packets can now be matched in the same way as the
       data in ARP packets.
 

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index ee9cb0426a318ea31333efa6c71124b30350c166..ed20a48e873ecf487500b7e1526f22f780cfeba8 100644 (file)
--- 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 c181b95aeab1b6bd940bd2620136756677dd9cee..9504cea4b7560fbaf2291e47630a442867c9011d 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1233,6 +1233,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>