X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.h;h=21d00484f2381090a84c7919abe3914ba9e9d6ac;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=ced869fb2933357da26bab2a3158566c798e7380;hpb=9ea0bccc83a84458d934966eae15c78f3ee2bac8;p=sliver-openvswitch.git

diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h
index ced869fb2..21d00484f 100644
--- a/lib/dpif-linux.h
+++ b/lib/dpif-linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "openvswitch/datapath-protocol.h"
+#include <linux/openvswitch.h>
+
+#include "flow.h"
 
 struct ofpbuf;
 
@@ -30,7 +32,7 @@ struct dpif_linux_vport {
 
     /* ovs_vport header. */
     int dp_ifindex;
-    uint32_t port_no;                      /* UINT32_MAX if unknown. */
+    odp_port_t port_no;                    /* ODPP_NONE if unknown. */
     enum ovs_vport_type type;
 
     /* Attributes.
@@ -39,9 +41,9 @@ struct dpif_linux_vport {
      * 32-bit boundaries, so use get_unaligned_u64() to access its values.
      */
     const char *name;                      /* OVS_VPORT_ATTR_NAME. */
-    const uint32_t *upcall_pid;            /* OVS_VPORT_ATTR_UPCALL_PID. */
+    uint32_t n_upcall_pids;
+    const uint32_t *upcall_pids;           /* OVS_VPORT_ATTR_UPCALL_PID. */
     const struct ovs_vport_stats *stats;   /* OVS_VPORT_ATTR_STATS. */
-    const uint8_t *address;                /* OVS_VPORT_ATTR_ADDRESS. */
     const struct nlattr *options;          /* OVS_VPORT_ATTR_OPTIONS. */
     size_t options_len;
 };
@@ -56,7 +58,4 @@ int dpif_linux_vport_get(const char *name, struct dpif_linux_vport *reply,
 
 bool dpif_linux_is_internal_device(const char *name);
 
-int dpif_linux_vport_send(int dp_ifindex, uint32_t port_no,
-                          const void *data, size_t size);
-
 #endif /* dpif-linux.h */