mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

odp-util: Share fields between odp and dpif_backer.

Browse Source 
Datapath support for some flow key fields is used inside ofproto-dpif as
well as odp-util. Share these fields using the same structure.

Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
This commit is contained in:
Joe Stringer
2015-06-30 16:43:03 -07:00
parent 7552cf4bca
commit 2494ccd78f
10 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/odp-util.c
View File

@@ -3467,7 +3467,7 @@ odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms,
nl_msg_put_u32(buf, OVS_KEY_ATTR_SKB_MARK, data->pkt_mark);
if (parms->recirc) {
if (parms->support.recirc) {
nl_msg_put_u32(buf, OVS_KEY_ATTR_RECIRC_ID, data->recirc_id);
nl_msg_put_u32(buf, OVS_KEY_ATTR_DP_HASH, data->dp_hash);
}
@@ -3542,7 +3542,7 @@ odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms,
n = flow_count_mpls_labels(flow, NULL);
if (export_mask) {
n = MIN(n, parms->max_mpls_depth);
n = MIN(n, parms->support.max_mpls_depth);
}
mpls_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_MPLS,
n * sizeof *mpls_key);