From 1280bf0e51e963dd3de6ee1e530bd4d7ce376591 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Mon, 5 Nov 2012 13:40:17 -0800 Subject: [PATCH] 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 --- 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 a9b9a496..b2360cfa 100644 --- 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 237cf715..113a0e28 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. - 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 ee9cb042..ed20a48e 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 c181b95a..9504cea4 100644 --- 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.
patch
-- 2.30.2