Merge branch 'mainstream'

diff --combined lib/automake.mk
index ac583c2,b1688ef..9a55b15
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -100,8 -100,6 +100,8 @@@ lib_libopenvswitch_la_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 \
@@@ -208,8 -206,6 +208,8 @@@
        lib/timeval.h \
        lib/token-bucket.c \
        lib/token-bucket.h \
 +      lib/tunalloc.c \
 +      lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \
@@@ -240,6 -236,7 +240,7 @@@ if WIN3
  lib_libopenvswitch_la_SOURCES += \
        lib/daemon-windows.c \
        lib/getopt_long.c \
+       lib/getrusage-windows.c \
        lib/latch-windows.c \
        lib/stream-fd-windows.c
  else
@@@ -278,7 -275,7 +279,7 @@@ if HAVE_WNO_UNUSED_PARAMETE
  lib_libsflow_la_CFLAGS += -Wno-unused-parameter
  endif
  
- if LINUX_DATAPATH
+ if LINUX
  lib_libopenvswitch_la_SOURCES += \
        lib/dpif-linux.c \
        lib/dpif-linux.h \

diff --combined lib/dpif.c
index 7d578eb,b983b25..db1a130
--- 1/lib/dpif.c
--- 2/lib/dpif.c
+++ b/lib/dpif.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+  * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -57,11 -57,10 +57,11 @@@ COVERAGE_DEFINE(dpif_purge)
  COVERAGE_DEFINE(dpif_execute_with_help);
  
  static const struct dpif_class *base_dpif_classes[] = {
- #ifdef LINUX_DATAPATH
+ #ifdef __linux__
      &dpif_linux_class,
  #endif
      &dpif_netdev_class,
 +    &dpif_planetlab_class,
  };
  
  struct registered_dpif_class {

diff --combined lib/netdev.c
index f5f9233,0567759..6aca2f4
--- 1/lib/netdev.c
--- 2/lib/netdev.c
+++ b/lib/netdev.c
@@@ -102,7 -102,7 +102,7 @@@ netdev_initialize(void
          fatal_signal_add_hook(restore_all_flags, NULL, NULL, true);
          netdev_vport_patch_register();
  
- #ifdef LINUX_DATAPATH
+ #ifdef __linux__
          netdev_register_provider(&netdev_linux_class);
          netdev_register_provider(&netdev_internal_class);
          netdev_register_provider(&netdev_tap_class);
@@@ -112,8 -112,6 +112,8 @@@
          netdev_register_provider(&netdev_tap_class);
          netdev_register_provider(&netdev_bsd_class);
  #endif
 +        netdev_register_provider(&netdev_tunnel_class);
 +        netdev_register_provider(&netdev_pltap_class);
  
          ovsthread_once_done(&once);
      }