From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Thu, 30 Aug 2012 14:35:26 +0000 (+0200)
Subject: Merge branch 'master' into forward-port
X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1e3f34c7693bcabae8e443ac1b246680ef9b60e2;p=sliver-openvswitch.git

Merge branch 'master' into forward-port

Conflicts:
	lib/automake.mk
	lib/dpif-netdev.c
	lib/netdev-provider.h
	lib/netdev.c
---

1e3f34c7693bcabae8e443ac1b246680ef9b60e2
diff --cc lib/automake.mk
index 818051750,11e9738a1..8f081ebe6
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@@ -177,8 -168,8 +178,10 @@@ lib_libopenvswitch_a_SOURCES = 
  	lib/timer.h \
  	lib/timeval.c \
  	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 \
diff --cc lib/netdev-provider.h
index 94f60af72,9a3217ecc..f56a0cefb
--- a/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@@ -596,9 -593,9 +596,12 @@@ const struct netdev_class *netdev_looku
  extern const struct netdev_class netdev_linux_class;
  extern const struct netdev_class netdev_internal_class;
  extern const struct netdev_class netdev_tap_class;
 +#ifdef __FreeBSD__
 +extern const struct netdev_class netdev_bsd_class;
 +#endif
+ extern const struct netdev_class netdev_tap_pl_class;
+ 
+ extern const struct netdev_class netdev_tunnel_class;
  
  #ifdef  __cplusplus
  }
diff --cc lib/netdev.c
index 394d8957f,9445bdf8b..2b4dec4cb
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@@ -79,12 -78,10 +79,14 @@@ netdev_initialize(void
          netdev_register_provider(&netdev_linux_class);
          netdev_register_provider(&netdev_internal_class);
          netdev_register_provider(&netdev_tap_class);
+ 	netdev_register_provider(&netdev_tap_pl_class);
          netdev_vport_register();
 +#endif
 +#ifdef __FreeBSD__
 +        netdev_register_provider(&netdev_tap_class);
 +        netdev_register_provider(&netdev_bsd_class);
  #endif
+ 	netdev_register_provider(&netdev_tunnel_class);
      }
  }