X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=cb2183761e7b0141155bf7698d10b5bcc73b6560;hb=44471ad36d13da6563a2244dcac863ac5e9e829b;hp=ec8a952b3d1611773ca410cb47edbad0f78cb8dd;hpb=5136364f41b74de00f86873a6f5be4c8a19cb5ad;p=openvswitch

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index ec8a952b..cb218376 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -43,7 +43,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(dpif_linux)
+VLOG_DEFINE_THIS_MODULE(dpif_linux);
 
 /* Datapath interface for the openvswitch Linux kernel module. */
 struct dpif_linux {
@@ -112,8 +112,8 @@ dpif_linux_enumerate(struct svec *all_dps)
 }
 
 static int
-dpif_linux_open(const char *name, const char *type OVS_UNUSED, bool create,
-                struct dpif **dpifp)
+dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name,
+                bool create, struct dpif **dpifp)
 {
     int minor;
 
@@ -338,8 +338,7 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep)
         return ENOBUFS;
     } else if (!shash_is_empty(&dpif->changed_ports)) {
         struct shash_node *node = shash_first(&dpif->changed_ports);
-        *devnamep = xstrdup(node->name);
-        shash_delete(&dpif->changed_ports, node);
+        *devnamep = shash_steal(&dpif->changed_ports, node);
         return 0;
     } else {
         return EAGAIN;
@@ -357,34 +356,6 @@ dpif_linux_port_poll_wait(const struct dpif *dpif_)
     }
 }
 
-static int
-dpif_linux_port_group_get(const struct dpif *dpif_, int group,
-                          uint16_t ports[], int n)
-{
-    struct odp_port_group pg;
-    int error;
-
-    assert(n <= UINT16_MAX);
-    pg.group = group;
-    pg.ports = ports;
-    pg.n_ports = n;
-    error = do_ioctl(dpif_, ODP_PORT_GROUP_GET, &pg);
-    return error ? -error : pg.n_ports;
-}
-
-static int
-dpif_linux_port_group_set(struct dpif *dpif_, int group,
-                          const uint16_t ports[], int n)
-{
-    struct odp_port_group pg;
-
-    assert(n <= UINT16_MAX);
-    pg.group = group;
-    pg.ports = (uint16_t *) ports;
-    pg.n_ports = n;
-    return do_ioctl(dpif_, ODP_PORT_GROUP_SET, &pg);
-}
-
 static int
 dpif_linux_flow_get(const struct dpif *dpif_, struct odp_flow flows[], int n)
 {
@@ -419,13 +390,12 @@ dpif_linux_flow_list(const struct dpif *dpif_, struct odp_flow flows[], int n)
 }
 
 static int
-dpif_linux_execute(struct dpif *dpif_, uint16_t in_port,
+dpif_linux_execute(struct dpif *dpif_,
                    const union odp_action actions[], int n_actions,
                    const struct ofpbuf *buf)
 {
     struct odp_execute execute;
     memset(&execute, 0, sizeof execute);
-    execute.in_port = in_port;
     execute.actions = (union odp_action *) actions;
     execute.n_actions = n_actions;
     execute.data = buf->data;
@@ -539,8 +509,6 @@ const struct dpif_class dpif_linux_class = {
     dpif_linux_port_list,
     dpif_linux_port_poll,
     dpif_linux_port_poll_wait,
-    dpif_linux_port_group_get,
-    dpif_linux_port_group_set,
     dpif_linux_flow_get,
     dpif_linux_flow_put,
     dpif_linux_flow_del,