X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=a37933d5a2b5c720fe2cb07994bca3df0d49d9d8;hb=a39c3ff9f586d3416976d3c3bd095fa81d73efa0;hp=e4a2f755dbbf9c95d97c0aaa38a3c23de33f8731;hpb=85c9de194b9f432f7b8a66bda980cbab52a55b72;p=sliver-openvswitch.git

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index e4a2f755d..a37933d5a 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -106,6 +106,7 @@ struct dp_netdev_port {
     int port_no;                /* Index into dp_netdev's 'ports'. */
     struct list node;           /* Element in dp_netdev's 'port_list'. */
     struct netdev *netdev;
+    struct netdev_saved_flags *sf;
     char *type;                 /* Port type as requested by user. */
 };
 
@@ -187,10 +188,17 @@ 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
+                  : dpif_netdev_class_is_planetlab(class) ? "pltap"
                   : dpif_netdev_class_is_dummy(class) ? "dummy"
                   : "tap";
 }
@@ -216,7 +224,8 @@ choose_port(struct dp_netdev *dp, const char *name)
 {
     int port_no;
 
-    if (dp->class != &dpif_netdev_class) {
+    if (dp->class != &dpif_netdev_class && 
+        dp->class != &dpif_planetlab_class) {
         const char *p;
         int start_no = 0;
 
@@ -374,6 +383,7 @@ static int
 do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
             uint32_t port_no)
 {
+    struct netdev_saved_flags *sf;
     struct dp_netdev_port *port;
     struct netdev *netdev;
     const char *open_type;
@@ -400,7 +410,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
         return error;
     }
 
-    error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, false);
+    error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf);
     if (error) {
         netdev_close(netdev);
         return error;
@@ -409,10 +419,11 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
     port = xmalloc(sizeof *port);
     port->port_no = port_no;
     port->netdev = netdev;
+    port->sf = sf;
     port->type = xstrdup(type);
 
     error = netdev_get_mtu(netdev, &mtu);
-    if (!error) {
+    if (!error && mtu > max_mtu) {
         max_mtu = mtu;
     }
 
@@ -493,7 +504,6 @@ static int
 do_del_port(struct dp_netdev *dp, uint32_t port_no)
 {
     struct dp_netdev_port *port;
-    char *name;
     int error;
 
     error = get_port_by_number(dp, port_no, &port);
@@ -505,11 +515,9 @@ do_del_port(struct dp_netdev *dp, uint32_t port_no)
     dp->ports[port->port_no] = NULL;
     dp->serial++;
 
-    name = xstrdup(netdev_vport_get_dpif_port(port->netdev));
     netdev_close(port->netdev);
+    netdev_restore_flags(port->sf);
     free(port->type);
-
-    free(name);
     free(port);
 
     return 0;
@@ -1319,41 +1327,49 @@ dp_netdev_execute_actions(struct dp_netdev *dp,
     }
 }
 
+#define DPIF_NETDEV_CLASS_FUNCTIONS			\
+    dpif_netdev_enumerate,				\
+    dpif_netdev_port_open_type,				\
+    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_port_open_type,
-    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
@@ -1386,3 +1402,4 @@ dpif_dummy_register(bool override)
 
     dpif_dummy_register__("dummy");
 }
+