diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2013-10-24 13:19:28 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-11-01 14:21:59 -0700 |
| commit | 44a7e26dcc2a68c0293b38c03048f938f318f0fd (patch) | |
| tree | 6f53ea4111cf179ea4d35c843e5fecc368ee28dc /lib/meta-flow.c | |
| parent | 7f98c44d8acbaf62ff5375e137bcf37b7336bbc8 (diff) | |
| download | openvswitch-44a7e26dcc2a68c0293b38c03048f938f318f0fd.tar.gz | |
OXM inspired match field names.
Adds OXM inspired aliases for match fields that don't have them
already ("ip_proto", "ip_ecn", "ip_dscp", and "tunnel_id").
"ip_dscp" replaces the earlier undocumented "nw_tos_shifted",
and takes the DSCP value (0-63), which is then shifted
appropriately when applied to an IP packet.
The number of bits for this field is fixed from 8 to 6.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/meta-flow.c')
| -rw-r--r-- | lib/meta-flow.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/meta-flow.c b/lib/meta-flow.c index f53f3c486..9f39c1838 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -49,7 +49,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { /* ## -------- ## */ { - MFF_TUN_ID, "tun_id", NULL, + MFF_TUN_ID, "tun_id", "tunnel_id", MF_FIELD_SIZES(be64), MFM_FULLY, MFS_HEXADECIMAL, @@ -411,7 +411,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { }, { - MFF_IP_PROTO, "nw_proto", NULL, + MFF_IP_PROTO, "nw_proto", "ip_proto", MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -433,8 +433,8 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OFPUTIL_P_ANY, /* Will be shifted for OXM. */ OFPUTIL_P_NONE, }, { - MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, - MF_FIELD_SIZES(u8), + MFF_IP_DSCP_SHIFTED, "ip_dscp", NULL, + 1, 6, MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, @@ -444,7 +444,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OFPUTIL_P_ANY, /* Will be shifted for non-OXM. */ OFPUTIL_P_NONE, }, { - MFF_IP_ECN, "nw_ecn", NULL, + MFF_IP_ECN, "nw_ecn", "ip_ecn", 1, 2, MFM_NONE, MFS_DECIMAL, |