projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Keep subfacet "used" times more up-to-date.
[openvswitch]
/
lib
/
odp-util.h
diff --git
a/lib/odp-util.h
b/lib/odp-util.h
index 57294ec64d8f274f8952928ba8815871b74a9473..00284996fe849ee32ed046f4fbb29595218df5aa 100644
(file)
--- a/
lib/odp-util.h
+++ b/
lib/odp-util.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011
, 2012
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-114,10
+114,10
@@
enum odp_key_fitness {
};
enum odp_key_fitness odp_flow_key_to_flow(const struct nlattr *, size_t,
struct flow *);
};
enum odp_key_fitness odp_flow_key_to_flow(const struct nlattr *, size_t,
struct flow *);
+const char *odp_key_fitness_to_string(enum odp_key_fitness);
enum user_action_cookie_type {
USER_ACTION_COOKIE_UNSPEC,
enum user_action_cookie_type {
USER_ACTION_COOKIE_UNSPEC,
- USER_ACTION_COOKIE_CONTROLLER, /* Packet for controller. */
USER_ACTION_COOKIE_SFLOW, /* Packet for sFlow sampling. */
};
USER_ACTION_COOKIE_SFLOW, /* Packet for sFlow sampling. */
};
@@
-136,4
+136,7
@@
BUILD_ASSERT_DECL(sizeof(struct user_action_cookie) == 8);
size_t odp_put_userspace_action(uint32_t pid,
const struct user_action_cookie *,
struct ofpbuf *odp_actions);
size_t odp_put_userspace_action(uint32_t pid,
const struct user_action_cookie *,
struct ofpbuf *odp_actions);
+
+void commit_odp_actions(const struct flow *, struct flow *base,
+ struct ofpbuf *odp_actions);
#endif /* odp-util.h */
#endif /* odp-util.h */