diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2011-11-01 10:13:16 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2011-11-01 10:13:16 -0700 |
| commit | abff858b5ad310a529d5a5ac2a230ee4ac9736db (patch) | |
| tree | ac2cb7524dc3267adf07e0df61d2aab5ee78836f /lib/odp-util.h | |
| parent | 7f4ae491b0fb5fb513e22ed2bd1829c5cd42e71c (diff) | |
datapath: Convert kernel priority actions into match/set.
Following patch adds skb-priority to flow key. So userspace will know
what was priority when packet arrived and we can remove the pop/reset
priority action. It's no longer necessary to have a special action for
pop that is based on the kernel remembering original skb->priority.
Userspace can just emit a set priority action with the original value.
Since the priority field is a match field with just a normal set action,
we can convert it into the new model for actions that are based on
matches.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Bug #7715
Diffstat (limited to 'lib/odp-util.h')
| -rw-r--r-- | lib/odp-util.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/odp-util.h b/lib/odp-util.h index 8c7d4d14..eceeae6b 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -66,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 @@ -75,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 |