diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-05-22 00:25:08 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-06-12 21:19:04 -0700 |
| commit | 7c00ccb6740ac240c7d50e3631b36553f47eb769 (patch) | |
| tree | eeedabf36e253cb14aa792df9feb99d363a37d1e /include/openflow/openflow-1.1.h | |
| parent | 790897648eacc8f5effbba88f9e60dab29edcaf5 (diff) | |
| download | openvswitch-7c00ccb6740ac240c7d50e3631b36553f47eb769.tar.gz | |
openflow-1.1.h: Fix OFPFW11_* definitions.
OFPFW_DL_SRC and OFPFW_DL_DST don't exist in OpenFlow 1.1. Replace them
by the correct enums.
Most of the change here is due to respacing since DL_VLAN_PCP is one
character wider than any previous name.
This doesn't fix a real bug because these constants didn't have any users
in the tree.
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'include/openflow/openflow-1.1.h')
| -rw-r--r-- | include/openflow/openflow-1.1.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h index 2b8e95b69..7d6e0162f 100644 --- a/include/openflow/openflow-1.1.h +++ b/include/openflow/openflow-1.1.h @@ -269,19 +269,19 @@ OFP_ASSERT(sizeof(struct ofp11_match) == OFPMT11_STANDARD_LENGTH); /* Flow wildcards. */ enum ofp11_flow_wildcards { - OFPFW11_IN_PORT = 1 << 0, /* Switch input port. */ - OFPFW11_DL_VLAN = 1 << 1, /* VLAN vid. */ - OFPFW11_DL_SRC = 1 << 2, /* Ethernet source address. */ - OFPFW11_DL_DST = 1 << 3, /* Ethernet destination address. */ - OFPFW11_DL_TYPE = 1 << 4, /* Ethernet frame type. */ - OFPFW11_NW_PROTO = 1 << 5, /* IP protocol. */ - OFPFW11_TP_SRC = 1 << 6, /* TCP/UDP source port. */ - OFPFW11_TP_DST = 1 << 7, /* TCP/UDP destination port. */ - OFPFW11_MPLS_LABEL = 1 << 8, /* MPLS label. */ - OFPFW11_MPLS_TC = 1 << 9, /* MPLS TC. */ + OFPFW11_IN_PORT = 1 << 0, /* Switch input port. */ + OFPFW11_DL_VLAN = 1 << 1, /* VLAN id. */ + OFPFW11_DL_VLAN_PCP = 1 << 2, /* VLAN priority. */ + OFPFW11_DL_TYPE = 1 << 3, /* Ethernet frame type. */ + OFPFW11_NW_TOS = 1 << 4, /* IP ToS (DSCP field, 6 bits). */ + OFPFW11_NW_PROTO = 1 << 5, /* IP protocol. */ + OFPFW11_TP_SRC = 1 << 6, /* TCP/UDP/SCTP source port. */ + OFPFW11_TP_DST = 1 << 7, /* TCP/UDP/SCTP destination port. */ + OFPFW11_MPLS_LABEL = 1 << 8, /* MPLS label. */ + OFPFW11_MPLS_TC = 1 << 9, /* MPLS TC. */ /* Wildcard all fields. */ - OFPFW11_ALL = ((1 << 10) - 1) + OFPFW11_ALL = ((1 << 10) - 1) }; /* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate |