diff options
| author | Jan Scheurich <jan.scheurich@ericsson.com> | 2017-06-23 16:47:57 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-06-27 17:28:30 -0400 |
| commit | 3d4b2e6eb74ed5bb5b35373aa8a489536938fee6 (patch) | |
| tree | f086a8ec9d205140a69fd39db0c4c8be67ab855c /ofproto/tunnel.c | |
| parent | be7ac2f3c105866542de5c1d4c7e2651250a3e92 (diff) | |
| download | openvswitch-3d4b2e6eb74ed5bb5b35373aa8a489536938fee6.tar.gz | |
userspace: Add OXM field MFF_PACKET_TYPE
Allow packet type namespace OFPHTN_ETHERTYPE as alternative pre-requisite
for matching L3 protocols (MPLS, IP, IPv6, ARP etc).
Change the meta-flow definition of packet_type field to use the new
custom format MFS_PACKET_TYPE representing "(NS,NS_TYPE)".
Parsing routine for MFS_PACKET_TYPE added to meta-flow.c. Formatting
routine for field packet_type extracted from match_format() and moved to
flow.c to be used from meta-flow.c for formatting MFS_PACKET_TYPE.
Updated the ovs-fields man page source meta-flow.xml with documentation
for packet-type-aware bridges and added documentation for field packet_type.
Added packet_type to the matching properties in tests/ofproto.at.
If dl_type is unwildcarded due to later packet modification, make sure it
is cleared again if the original packet_type was not PT_ETH.
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/tunnel.c')
| -rw-r--r-- | ofproto/tunnel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index e27a9fb75..fa99b3102 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -386,8 +386,6 @@ tnl_wc_init(struct flow *flow, struct flow_wildcards *wc) && IP_ECN_is_ce(flow->tunnel.ip_tos)) { wc->masks.nw_tos |= IP_ECN_MASK; } - /* Match on packet_type for tunneled packets.*/ - wc->masks.packet_type = OVS_BE32_MAX; } } |