diff --git a/NEWS b/NEWS index 423018945..8d0b50213 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Post-v2.9.0 * Previous versions gave OpenFlow tables default names of the form "table#". These are not helpful names for the purpose of accepting and displaying table names, so now tables by default have no names. + * The "null" interface type, deprecated since 2013, has been removed. - ovs-ofctl: * ovs-ofctl now accepts and display table names in place of numbers. By default it always accepts names and in interactive use it displays them; diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index f03fb567f..d90997e3a 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3448,11 +3448,6 @@ bridge_del_ports(struct bridge *br, const struct shash *wanted_ports) if (iface) { iface->cfg = cfg; iface->type = type; - } else if (!strcmp(type, "null")) { - VLOG_WARN_ONCE("%s: The null interface type is deprecated and" - " may be removed in February 2013. Please email" - " dev@openvswitch.org with concerns.", - cfg->name); } else { /* We will add new interfaces later. */ } @@ -4074,11 +4069,7 @@ port_del_ifaces(struct port *port) /* Collect list of new interfaces. */ sset_init(&new_ifaces); for (i = 0; i < port->cfg->n_interfaces; i++) { - const char *name = port->cfg->interfaces[i]->name; - const char *type = port->cfg->interfaces[i]->type; - if (strcmp(type, "null")) { - sset_add(&new_ifaces, name); - } + sset_add(&new_ifaces, port->cfg->interfaces[i]->name); } /* Get rid of deleted interfaces. */ diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 0c6a43d60..f899a1976 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -2270,10 +2270,6 @@
null