Signed-off-by: Ben Pfaff <b...@ovn.org>
---
ofproto/ofproto.c | 6 ------
tests/ofproto.at | 23 -----------------------
2 files changed, 29 deletions(-)
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 5794dfd54fc5..f5aaf0b1fd44 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -3483,12 +3483,6 @@ ofproto_packet_out_init(struct ofproto *ofproto,
return OFPERR_OFPBRC_BUFFER_UNKNOWN;
}
- /* NON-PTAP bridge should accept only Ethernet packet. */
- if (!ofproto->packet_type_aware &&
- po->flow_metadata.flow.packet_type != htonl(PT_ETH)) {
- return OFPERR_OFPBRC_BAD_PACKET;
- }
-
/* Ensure that the L3 header is 32-bit aligned. */
opo->packet = dp_packet_clone_data_with_headroom(po->packet,
po->packet_len, 2);
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 3dd5cbea0063..d466ae54cc61 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -4221,29 +4221,6 @@ OFPT_BARRIER_REPLY (OF1.3):
OVS_VSWITCHD_STOP
AT_CLEANUP
-dnl This test checks that NON-PTAP bridge rejects 1.5 packet-out with
packet_type PT_IPV4.
-AT_SETUP([ofproto - packet-out with set_field metadata with packet_type
PT_IPV4 on NON-PTAP bridge (OpenFlow 1.5)])
-OVS_VSWITCHD_START
-
-AT_CHECK([
- ovs-vsctl set bridge br0 other-config:packet-type-aware=false
-], [0])
-
-AT_CHECK([ovs-ofctl -O OpenFlow15 packet-out br0 "in_port=controller
packet=4500002012344000ff1155670a0000140a00001e006400c8000cea78ffffffff
packet_type(1,0x800)
actions=set_field:0xfafafafa5a5a5a5a->metadata,controller"],
-[1], [], [dnl
-OFPT_ERROR (OF1.5) (xid=0x4): OFPBRC_BAD_PACKET
-OFPT_PACKET_OUT (OF1.5) (xid=0x4):
-(***truncated to 64 bytes from 104***)
-00000000 06 0d 00 68 00 00 00 04-ff ff ff ff 00 20 00 00 |...h......... ..|
-00000010 00 01 00 14 80 00 58 04-00 01 08 00 80 00 00 04 |......X.........|
-00000020 ff ff ff fd 00 00 00 00-00 19 00 10 80 00 04 08 |................|
-00000030 fa fa fa fa 5a 5a 5a 5a-00 00 00 10 ff ff ff fd |....ZZZZ........|
-])
-
-OVS_VSWITCHD_STOP
-AT_CLEANUP
-
-
dnl This test checks that metadata is encoded in packet_in structures,
dnl supported by NXAST.
AT_SETUP([ofproto - packet-out with metadata (NXM)])
--
2.10.2
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
