X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=48bc92d91bad007c4c6d7d05d10bd2141dd9d7c2;hb=1e3f34c7693bcabae8e443ac1b246680ef9b60e2;hp=144b6b63375c91f5ff937fd013d62849f6001dd4;hpb=079b5942276a04b2b18f1ec5bd2e07170e3ab9bd;p=sliver-openvswitch.git

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 144b6b633..48bc92d91 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -316,6 +316,15 @@ dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats)
     return 0;
 }
 
+static const char* internal_port_type(const struct dp_netdev* dp)
+{
+	if (dp->class == &dpif_netdev_class)
+		return "tap";
+	if (dp->class == &dpif_planetlab_class)
+		return "tap_pl";
+	return "dummy";
+}
+
 static int
 do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
             uint16_t port_no)
@@ -329,9 +338,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
     /* XXX reject devices already in some dp_netdev. */
 
     /* Open and validate network device. */
-    open_type = (strcmp(type, "internal") ? type
-                 : dp->class != &dpif_netdev_class ? "dummy"
-                 : "tap");
+    open_type = (strcmp(type, "internal") ? type : internal_port_type(dp));
     error = netdev_open(devname, open_type, &netdev);
     if (error) {
         return error;
@@ -376,7 +383,9 @@ choose_port(struct dpif *dpif, struct netdev *netdev)
     struct dp_netdev *dp = get_dp_netdev(dpif);
     int port_no;
 
-    if (dpif->dpif_class != &dpif_netdev_class) {
+    if (dpif->dpif_class != &dpif_netdev_class &&
+        dpif->dpif_class != &dpif_planetlab_class)
+    {
         /* If the port name contains a number, try to assign that port number.
          * This can make writing unit tests easier because port numbers are
          * predictable. */
@@ -1265,40 +1274,48 @@ dp_netdev_execute_actions(struct dp_netdev *dp,
     }
 }
 
+#define DPIF_NETDEV_CLASS_FUNCTIONS 			\
+    dpif_netdev_enumerate,				\
+    dpif_netdev_open,					\
+    dpif_netdev_close,					\
+    dpif_netdev_destroy,				\
+    dpif_netdev_run,					\
+    dpif_netdev_wait,					\
+    dpif_netdev_get_stats,				\
+    dpif_netdev_port_add,				\
+    dpif_netdev_port_del,				\
+    dpif_netdev_port_query_by_number,			\
+    dpif_netdev_port_query_by_name,			\
+    dpif_netdev_get_max_ports,				\
+    NULL,                       /* port_get_pid */	\
+    dpif_netdev_port_dump_start,			\
+    dpif_netdev_port_dump_next,				\
+    dpif_netdev_port_dump_done,				\
+    dpif_netdev_port_poll,				\
+    dpif_netdev_port_poll_wait,				\
+    dpif_netdev_flow_get,				\
+    dpif_netdev_flow_put,				\
+    dpif_netdev_flow_del,				\
+    dpif_netdev_flow_flush,				\
+    dpif_netdev_flow_dump_start,			\
+    dpif_netdev_flow_dump_next,				\
+    dpif_netdev_flow_dump_done,				\
+    dpif_netdev_execute,				\
+    NULL,                       /* operate */		\
+    dpif_netdev_recv_set,				\
+    dpif_netdev_queue_to_priority,			\
+    dpif_netdev_recv,					\
+    dpif_netdev_recv_wait,				\
+    dpif_netdev_recv_purge,				\
+
 const struct dpif_class dpif_netdev_class = {
     "netdev",
-    dpif_netdev_enumerate,
-    dpif_netdev_open,
-    dpif_netdev_close,
-    dpif_netdev_destroy,
-    dpif_netdev_run,
-    dpif_netdev_wait,
-    dpif_netdev_get_stats,
-    dpif_netdev_port_add,
-    dpif_netdev_port_del,
-    dpif_netdev_port_query_by_number,
-    dpif_netdev_port_query_by_name,
-    dpif_netdev_get_max_ports,
-    NULL,                       /* port_get_pid */
-    dpif_netdev_port_dump_start,
-    dpif_netdev_port_dump_next,
-    dpif_netdev_port_dump_done,
-    dpif_netdev_port_poll,
-    dpif_netdev_port_poll_wait,
-    dpif_netdev_flow_get,
-    dpif_netdev_flow_put,
-    dpif_netdev_flow_del,
-    dpif_netdev_flow_flush,
-    dpif_netdev_flow_dump_start,
-    dpif_netdev_flow_dump_next,
-    dpif_netdev_flow_dump_done,
-    dpif_netdev_execute,
-    NULL,                       /* operate */
-    dpif_netdev_recv_set,
-    dpif_netdev_queue_to_priority,
-    dpif_netdev_recv,
-    dpif_netdev_recv_wait,
-    dpif_netdev_recv_purge,
+    DPIF_NETDEV_CLASS_FUNCTIONS
+};
+
+const struct dpif_class dpif_planetlab_class = {
+    "planetlab",
+    DPIF_NETDEV_CLASS_FUNCTIONS
 };
 
 static void
@@ -1331,3 +1348,4 @@ dpif_dummy_register(bool override)
 
     dpif_dummy_register__("dummy");
 }
+