[ovs-dev] [PATCH 5/6] vswitch: Remove PMTUD support from userspace.

[Ethan Jackson]

This patch removes path mtu discovery from userspace.  The feature
still exists in the kernel where it will need to be removed in the
future.

Signed-off-by: Ethan Jackson <ethan at nicira.com>
---
 NEWS                 |    1 +
 lib/netdev-vport.c   |   11 -----------
 vswitchd/vswitch.xml |   12 ------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 2f8fbde..d606183 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ post-v1.9.0
       available through ovs-appctl allow control over logging rate limits.
     - The OpenFlow "dp_desc" may now be configured by setting the value of 
       other-config:dp-desc in the Bridge table.
+    - PMTUD is no longer supported.
 
 
 v1.9.0 - xx xxx xxxx
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 36926ed..acf7d18 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -584,14 +584,6 @@ parse_tunnel_config(const char *name, const char *type,
             if (!strcmp(node->value, "false")) {
                 flags &= ~TNL_F_DF_DEFAULT;
             }
-        } else if (!strcmp(node->key, "pmtud")) {
-            if (!strcmp(node->value, "true")) {
-                VLOG_WARN_ONCE("%s: The tunnel Path MTU discovery is "
-                               "deprecated and may be removed in February "
-                               "2013. Please email dev at openvswitch.org with "
-                               "concerns.", name);
-                flags |= TNL_F_PMTUD;
-            }
         } else if (!strcmp(node->key, "peer_cert") && is_ipsec) {
             if (smap_get(args, "certificate")) {
                 ipsec_mech_set = true;
@@ -791,9 +783,6 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
     if (!(flags & TNL_F_DF_DEFAULT)) {
         smap_add(args, "df_default", "false");
     }
-    if (flags & TNL_F_PMTUD) {
-        smap_add(args, "pmtud", "true");
-    }
 
     return 0;
 }
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 64ad6c7..a6f8c07 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1415,18 +1415,6 @@
         <code>false</code> to disable.
       </column>
 
-      <column name="options" key="pmtud" type='{"type": "boolean"}'>
-        Optional.  Enable tunnel path MTU discovery.  If enabled ``ICMP
-        Destination Unreachable - Fragmentation Needed'' messages will be
-        generated for IPv4 packets with the DF bit set and IPv6 packets above
-        the minimum MTU if the packet size exceeds the path MTU minus the size
-        of the tunnel headers.  Note that this option causes behavior that is
-        typically reserved for routers and therefore is not entirely in
-        compliance with the IEEE 802.1D specification for bridges.  Default is
-        disabled; set to <code>true</code> to enable.  This feature is
-        deprecated and will be removed soon.
-      </column>
-
       <group title="Tunnel Options: gre and ipsec_gre only">
         <p>
           Only <code>gre</code> and <code>ipsec_gre</code> interfaces support
-- 
1.7.9.5