From patchwork Fri Mar 9 18:45:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 883925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zybsk1vMLz9scN for ; Sat, 10 Mar 2018 05:45:14 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4A2E6F04; Fri, 9 Mar 2018 18:45:12 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D3E57EFD for ; Fri, 9 Mar 2018 18:45:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 21045609 for ; Fri, 9 Mar 2018 18:45:10 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 8FB57A80CE; Fri, 9 Mar 2018 19:45:07 +0100 (CET) From: Ben Pfaff To: dev@openvswitch.org Date: Fri, 9 Mar 2018 10:45:04 -0800 Message-Id: <20180309184504.25961-1-blp@ovn.org> X-Mailer: git-send-email 2.16.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] vswitchd: Remove support for deprecated "null" interfaces. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This interface type was deprecated in 2013, so it is time to remove it. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- NEWS | 1 + vswitchd/bridge.c | 5 ----- vswitchd/vswitch.xml | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) 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 @@
A pair of virtual devices that act as a patch cable.
- -
null
-
An ignored interface. Deprecated and slated for removal in - February 2013.