From 0faed34652f3d1a383510ce18540a743e0fb97f6 Mon Sep 17 00:00:00 2001
From: Ethan Jackson <ethan@nicira.com>
Date: Tue, 21 Aug 2012 15:44:58 -0700
Subject: [PATCH] bridge: Deprecate the null interface type.

It's not entirely clear what problem the null interface type is
trying to solve, nor how it could be of use to any controller.
This patch deprecates it, and schedules its removal for February
2013.  If there are concerns, please email dev@openvswitch.org.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
---
 NEWS                 | 2 ++
 vswitchd/bridge.c    | 7 ++++++-
 vswitchd/vswitch.xml | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 45e11764c..872f8d0d8 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ post-v1.8.0
       February 2013.  Please email dev@openvswitch.org with concerns.
     - The autopath action is deprecated and will be removed no earlier than
       February 2013.  Please email dev@openvswitch.org with concerns.
+    - The null interface type is deprecated and will be removed no earlier
+      than February 2013.  Please email dev@openvswitch.org with concerns.
 
 
 v1.8.0 - xx xxx xxxx
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 1fbbe32ac..022573979 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2525,7 +2525,12 @@ bridge_add_del_ports(struct bridge *br,
             if (iface) {
                 iface->cfg = cfg;
                 iface->type = type;
-            } else if (strcmp(type, "null")) {
+            } 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 {
                 bridge_queue_if_cfg(br, cfg, port);
             }
         }
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index b71a30874..a1b99f863 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1215,7 +1215,8 @@
           </dd>
 
           <dt><code>null</code></dt>
-          <dd>An ignored interface.</dd>
+          <dd>An ignored interface. Deprecated and slated for removal in
+              February 2013.</dd>
         </dl>
       </column>
     </group>
-- 
2.47.0