| Message ID | 20180309184504.25961-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] vswitchd: Remove support for deprecated "null" interfaces. | expand |
> On Mar 9, 2018, at 10:45 AM, Ben Pfaff <blp@ovn.org> wrote: > > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c > index f03fb567f0be..95a126d52b4a 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. */ > } I think there's another reference in the function port_del_ifaces(). Acked-by: Justin Pettit <jjpettit@ovn.org> --Justin
On Mon, Mar 12, 2018 at 05:39:55PM -0700, Justin Pettit wrote: > > > On Mar 9, 2018, at 10:45 AM, Ben Pfaff <blp@ovn.org> wrote: > > > > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c > > index f03fb567f0be..95a126d52b4a 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. */ > > } > > I think there's another reference in the function port_del_ifaces(). > > Acked-by: Justin Pettit <jjpettit@ovn.org> Thanks for noticing. I removed the other reference and pushed this to master.
diff --git a/NEWS b/NEWS index 423018945885..8d0b50213122 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 f03fb567f0be..95a126d52b4a 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. */ } diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 0c6a43d602c7..f899a19764a4 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -2270,10 +2270,6 @@ <dd> A pair of virtual devices that act as a patch cable. </dd> - - <dt><code>null</code></dt> - <dd>An ignored interface. Deprecated and slated for removal in - February 2013.</dd> </dl> </column> </group>
This interface type was deprecated in 2013, so it is time to remove it. Signed-off-by: Ben Pfaff <blp@ovn.org> --- NEWS | 1 + vswitchd/bridge.c | 5 ----- vswitchd/vswitch.xml | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-)