[ovs-dev] [patch_ports 3/4] ofproto-dpif: Implement patch ports in userspace.

[Ethan Jackson]

I've folded this incremental in.

---
 FAQ  |   12 +++---------
 NEWS |    1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/FAQ b/FAQ
index 6d14fc8..b9f655b 100644
--- a/FAQ
+++ b/FAQ
@@ -172,17 +172,11 @@ A: The kernel module in upstream Linux 3.3 and later does not include
          vSwitch distribution instead of the upstream Linux kernel
          module.
 
-       - Patch virtual ports, that is, interfaces with type "patch".
-         You can use Linux "veth" devices as a substitute.
-
-         We don't have any plans to add patch ports upstream.
-
 Q: What features are not available when using the userspace datapath?
 
-A: Tunnel and patch virtual ports are not supported, as described in the
-   previous answer.  It is also not possible to use queue-related
-   actions.  On Linux kernels before 2.6.39, maximum-sized VLAN packets
-   may not be transmitted.
+A: Tunnels are not supported, as described in the previous answer.  It
+   is also not possible to use queue-related actions.  On Linux kernels
+   before 2.6.39, maximum-sized VLAN packets may not be transmitted.
 
 
 Terminology
diff --git a/NEWS b/NEWS
index 3f06a7a..bf3c441 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ post-v1.9.0
         syntax.  OpenFlow 1.1 adds a port named ANY, which introduces a
         conflict.  ANY was rarely used in flow syntax, so we chose to
         retire that meaning of ANY in favor of the OpenFlow 1.1 meaning.
+    - Patch ports are implemented in userspace.
 
 
 v1.9.0 - xx xxx xxxx
-- 
1.7.9.5