X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.h;h=21d00484f2381090a84c7919abe3914ba9e9d6ac;hb=1579cf677fc;hp=6ccd54a26b8c5a3926b910e3bcdc611139601f17;hpb=f0fef76062d67bff94a3243a469f182dd6f503a1;p=sliver-openvswitch.git

diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h
index 6ccd54a26..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.
@@ -18,8 +18,11 @@
 #define DPIF_LINUX_H 1
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
-#include "openvswitch/datapath-protocol.h"
+#include <linux/openvswitch.h>
+
+#include "flow.h"
 
 struct ofpbuf;
 
@@ -27,20 +30,22 @@ struct dpif_linux_vport {
     /* Generic Netlink header. */
     uint8_t cmd;
 
-    /* odp_vport header. */
-    uint32_t dp_idx;
-    uint32_t port_no;                      /* UINT32_MAX if unknown. */
-    enum odp_vport_type type;
-
-    /* Attributes. */
-    const char *name;                      /* ODP_VPORT_ATTR_NAME. */
-    const struct rtnl_link_stats64 *stats; /* ODP_VPORT_ATTR_STATS. */
-    const uint8_t *address;                /* ODP_VPORT_ATTR_ADDRESS. */
-    int mtu;                               /* ODP_VPORT_ATTR_MTU. */
-    const struct nlattr *options;          /* ODP_VPORT_ATTR_OPTIONS. */
+    /* ovs_vport header. */
+    int dp_ifindex;
+    odp_port_t port_no;                    /* ODPP_NONE if unknown. */
+    enum ovs_vport_type type;
+
+    /* Attributes.
+     *
+     * The 'stats' member points to 64-bit data that might only be aligned on
+     * 32-bit boundaries, so use get_unaligned_u64() to access its values.
+     */
+    const char *name;                      /* OVS_VPORT_ATTR_NAME. */
+    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 struct nlattr *options;          /* OVS_VPORT_ATTR_OPTIONS. */
     size_t options_len;
-    int ifindex;                           /* ODP_VPORT_ATTR_IFINDEX. */
-    int iflink;                            /* ODP_VPORT_ATTR_IFLINK. */
 };
 
 void dpif_linux_vport_init(struct dpif_linux_vport *);