X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-util.h;h=eceeae6b404cd54d3f83913071c61456042591c1;hb=e1154f713ec8f47ff38979d76e9456b49b0bc264;hp=04a909ca001c4113edd741e1c054c3578976e671;hpb=5fa270099ab418ed0063144777ec76716dd3a207;p=sliver-openvswitch.git

diff --git a/lib/odp-util.h b/lib/odp-util.h
index 04a909ca0..eceeae6b4 100644
--- a/lib/odp-util.h
+++ b/lib/odp-util.h
@@ -21,9 +21,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
+#include <linux/openvswitch.h>
 #include "hash.h"
 #include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
 #include "util.h"
 
 struct ds;
@@ -58,9 +58,6 @@ odp_port_to_ofp_port(uint16_t odp_port)
         return odp_port;
     }
 }
-
-int odp_action_len(uint16_t type);
-void format_odp_action(struct ds *, const struct nlattr *);
 void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
                         size_t actions_len);
 
@@ -69,6 +66,7 @@ void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
  *
  *                         struct  pad  nl hdr  total
  *                         ------  ---  ------  -----
+ *  OVS_KEY_ATTR_PRIORITY      4    --     4      8
  *  OVS_KEY_ATTR_TUN_ID        8    --     4     12
  *  OVS_KEY_ATTR_IN_PORT       4    --     4      8
  *  OVS_KEY_ATTR_ETHERNET     12    --     4     16
@@ -78,14 +76,14 @@ void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
  *  OVS_KEY_ATTR_ICMPV6        2     2     4      8
  *  OVS_KEY_ATTR_ND           28    --     4     32
  *  -------------------------------------------------
- *  total                                       132
+ *  total                                       140
  */
-#define ODPUTIL_FLOW_KEY_BYTES 132
+#define ODPUTIL_FLOW_KEY_BYTES 140
 
 /* This is an imperfect sanity-check that ODPUTIL_FLOW_KEY_BYTES doesn't
  * need to be updated, but will at least raise awareness when new OVS
  * datapath key types are added. */
-BUILD_ASSERT_DECL(__OVS_KEY_ATTR_MAX == 14);
+BUILD_ASSERT_DECL(__OVS_KEY_ATTR_MAX == 15);
 
 /* A buffer with sufficient size and alignment to hold an nlattr-formatted flow
  * key.  An array of "struct nlattr" might not, in theory, be sufficiently