These patches enable tpid 0x88a8, multiple VLAN headers, and add new vlan_mode
"dot1q-tunnel". See commit message of patch1 for details.
v2: Add VLAN handling test cases for dot1q-tunnel vlan_mode.
Adjust VLAN+MPLS test cases for multi VLAN.
v3: Set default max_vlan_headers of netdev and test-odp (fix test failure found
by Tom).
Fix loop condition when parsing mask in odp-util.c.
Clean up comments.
v4: Rename vlan_hdr to flow_vlan_hdr.
Correct tpid/dl_type handling in odp-util.c
Add parameter to miniflow_get_vid to get inner vid, and add inner VLAN
check in test-classifier.c
Xiao Liang (4):
Add support for 802.1ad (QinQ tunneling)
tests: Add tests for QinQ VLAN handling
tests: Adjust VLAN+MPLS handling cases for QinQ
tests: Set default max_vlan_headers
include/openvswitch/flow.h | 13 +-
include/openvswitch/ofp-actions.h | 10 +-
include/openvswitch/packets.h | 5 +
lib/dpctl.c | 29 ++-
lib/dpif-netdev.c | 8 +-
lib/flow.c | 110 ++++++----
lib/flow.h | 19 +-
lib/match.c | 47 ++--
lib/meta-flow.c | 22 +-
lib/nx-match.c | 14 +-
lib/odp-util.c | 234 +++++++++++++-------
lib/odp-util.h | 4 +-
lib/ofp-actions.c | 61 +++---
lib/ofp-util.c | 56 ++---
lib/tnl-ports.c | 2 +-
ofproto/bond.c | 2 +-
ofproto/ofproto-dpif-ipfix.c | 6 +-
ofproto/ofproto-dpif-rid.h | 2 +-
ofproto/ofproto-dpif-sflow.c | 4 +-
ofproto/ofproto-dpif-xlate.c | 436 ++++++++++++++++++++++++++------------
ofproto/ofproto-dpif-xlate.h | 6 +-
ofproto/ofproto-dpif.c | 74 ++++++-
ofproto/ofproto.h | 8 +-
ovn/controller/pinctrl.c | 5 +-
tests/ofproto-dpif.at | 238 ++++++++++++---------
tests/test-classifier.c | 17 +-
tests/test-odp.c | 1 +
utilities/ovs-ofctl.c | 29 +--
vswitchd/bridge.c | 27 ++-
vswitchd/vswitch.ovsschema | 14 +-
vswitchd/vswitch.xml | 31 +++
31 files changed, 1020 insertions(+), 514 deletions(-)
--
2.9.0
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
