Merge branch 'mainstream'

Conflicts:
	lib/dpif-netdev.c

diff --cc lib/automake.mk
index 185f092,d333a4d..58d8da2
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -90,9 -90,9 +90,11 @@@ lib_libopenvswitch_a_SOURCES = 
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
 +      lib/netdev-tunnel.c \
 +      lib/netdev-pltap.c \
        lib/netdev-provider.h \
+       lib/netdev-vport.c \
+       lib/netdev-vport.h \
        lib/netdev.c \
        lib/netdev.h \
        lib/netflow.h \

diff --cc lib/dpif-netdev.c
index 13f5715,038dfdc..129839c
--- 1/lib/dpif-netdev.c
--- 2/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@@ -180,13 -181,18 +181,25 @@@ dpif_netdev_enumerate(struct sset *all_
      return 0;
  }
  
+ static bool
+ dpif_netdev_class_is_dummy(const struct dpif_class *class)
+ {
+     return class != &dpif_netdev_class;
+ }
+ 
++static bool
++dpif_netdev_class_is_planetlab(const struct dpif_class *class)
++{
++    return class == &dpif_planetlab_class;
++}
++
  static const char *
  dpif_netdev_port_open_type(const struct dpif_class *class, const char *type)
  {
      return strcmp(type, "internal") ? type
-                   : class == &dpif_netdev_class ? "tap"
-                   : class == &dpif_planetlab_class ? "pltap"
-                   : "dummy";
++                  : dpif_netdev_class_is_planetlab(class) ? "pltap"
+                   : dpif_netdev_class_is_dummy(class) ? "dummy"
+                   : "tap";
  }
  
  static struct dpif *

diff --cc lib/netdev.c
Simple merge