Remove support for OpenFlow 1.6 (draft).

ONF abandoned the OpenFlow specification, so that OpenFlow 1.6 will never
be completed.  It did not contain much in the way of useful features, so
remove what support Open vSwitch already had.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>

7 files changed, 5 insertions, 103 deletions

diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index 9755e7c03..18cc64989 100644
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -9,7 +9,6 @@ openflowinclude_HEADERS = \
 	include/openflow/openflow-1.3.h \
 	include/openflow/openflow-1.4.h \
 	include/openflow/openflow-1.5.h \
-	include/openflow/openflow-1.6.h \
 	include/openflow/openflow-common.h \
 	include/openflow/openflow.h
 
diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index ad06610da..68c79526e 100644
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -21,11 +21,6 @@
 
 #include <openflow/openflow-common.h>
 
-/* Maximum name of a port.
- *
- * OpenFlow 1.6 (draft) increases this to 64. */
-#define OFP10_MAX_PORT_NAME_LEN  16
-
 /* Port number(s)   meaning
  * ---------------  --------------------------------------
  * 0x0000           not assigned a meaning by OpenFlow 1.0
@@ -102,7 +97,7 @@ enum ofp10_port_features {
 struct ofp10_phy_port {
     ovs_be16 port_no;
     struct eth_addr hw_addr;
-    char name[OFP10_MAX_PORT_NAME_LEN]; /* Null-terminated */
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
 
     ovs_be32 config;        /* Bitmap of OFPPC_* and OFPPC10_* flags. */
     ovs_be32 state;         /* Bitmap of OFPPS_* and OFPPS10_* flags. */
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index a29db8f3e..52e96fdbc 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -113,7 +113,7 @@ struct ofp11_port {
     uint8_t pad[4];
     struct eth_addr hw_addr;
     uint8_t pad2[2];                  /* Align to 64 bits. */
-    char name[OFP10_MAX_PORT_NAME_LEN]; /* Null-terminated */
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
 
     ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
     ovs_be32 state;         /* Bitmap of OFPPS_* and OFPPS11_* flags. */
diff --git a/include/openflow/openflow-1.4.h b/include/openflow/openflow-1.4.h
index 9399950b2..2bfa16b63 100644
--- a/include/openflow/openflow-1.4.h
+++ b/include/openflow/openflow-1.4.h
@@ -80,7 +80,7 @@ struct ofp14_port {
     uint8_t pad[2];
     struct eth_addr hw_addr;
     uint8_t pad2[2];                  /* Align to 64 bits. */
-    char name[OFP10_MAX_PORT_NAME_LEN]; /* Null-terminated */
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
 
     ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
     ovs_be32 state;         /* Bitmap of OFPPS_* flags. */
diff --git a/include/openflow/openflow-1.6.h b/include/openflow/openflow-1.6.h
deleted file mode 100644
index 13c0b7bd5..000000000
--- a/include/openflow/openflow-1.6.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
- * Junior University
- * Copyright (c) 2011, 2013, 2014 Open Networking Foundation
- *
- * We are making the OpenFlow specification and associated documentation
- * (Software) available for public use and benefit with the expectation
- * that others will use, modify and enhance the Software and contribute
- * those enhancements back to the community. However, since we would
- * like to make the Software available for broadest use, with as few
- * restrictions as possible permission is hereby granted, free of
- * charge, to any person obtaining a copy of this Software to deal in
- * the Software under the copyrights without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * The name and trademarks of copyright holder(s) may NOT be used in
- * advertising or publicity pertaining to the Software or any
- * derivatives without specific, written prior permission.
- */
-
-/*
- * Copyright (c) 2017 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef OPENFLOW_16_H
-#define OPENFLOW_16_H 1
-
-#include <openflow/openflow-common.h>
-
-#define OFP16_MAX_PORT_NAME_LEN  64
-
-struct ofp16_port {
-    ovs_be32 port_no;
-    ovs_be16 length;
-    uint8_t pad[2];                   /* Align to 64 bits. */
-    struct eth_addr hw_addr;          /* EUI-48 hardware address. */
-    uint8_t pad2[2];                  /* Align to 64 bits. */
-    struct eth_addr64 hw_addr64;      /* EUI-64 hardware address */
-    char name[OFP16_MAX_PORT_NAME_LEN]; /* Null-terminated */
-
-    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
-    ovs_be32 state;         /* Bitmap of OFPPS_* flags. */
-
-    /* Followed by 0 or more OFPPDPT14_* properties.  (OpenFlow 1.6 (draft)
-     * defines the same properties as OpenFlow 1.4.) */
-};
-OFP_ASSERT(sizeof(struct ofp16_port) == 96);
-
-struct ofp16_port_mod {
-    ovs_be32 port_no;
-    uint8_t pad[4];              /* Align to 64 bits. */
-    struct eth_addr hw_addr;
-    uint8_t pad2[2];
-    struct eth_addr64 hw_addr64; /* EUI-64 hardware address */
-
-    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
-    ovs_be32 mask;          /* Bitmap of OFPPC_* flags to be changed. */
-
-    /* Followed by 0 or more OFPPMPT14_* properties.  (OpenFlow 1.6 (draft)
-     * defines the same properties as OpenFlow 1.4.) */
-};
-OFP_ASSERT(sizeof(struct ofp16_port_mod) == 32);
-
-
-#endif /* openflow/openflow-1.6.h */
diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h
index ea6bb41bc..584f20ec1 100644
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -79,8 +79,7 @@ enum ofp_version {
     OFP12_VERSION = 0x03,
     OFP13_VERSION = 0x04,
     OFP14_VERSION = 0x05,
-    OFP15_VERSION = 0x06,
-    OFP16_VERSION = 0x07
+    OFP15_VERSION = 0x06
 };
 
 /* Vendor (aka experimenter) IDs.
@@ -113,6 +112,7 @@ enum ofp_version {
 #define INTEL_VENDOR_ID 0x0000AA01 /* Intel */
 
 #define OFP_MAX_TABLE_NAME_LEN 32
+#define OFP_MAX_PORT_NAME_LEN  16
 
 #define OFP_OLD_PORT  6633
 #define OFP_PORT  6653
diff --git a/include/openflow/openflow.h b/include/openflow/openflow.h
index fececb563..918613d07 100644
--- a/include/openflow/openflow.h
+++ b/include/openflow/openflow.h
@@ -23,6 +23,5 @@
 #include <openflow/openflow-1.3.h>
 #include <openflow/openflow-1.4.h>
 #include <openflow/openflow-1.5.h>
-#include <openflow/openflow-1.6.h>
 
 #endif /* openflow/openflow.h */