From: Jarno Rajahalme Date: Fri, 7 Feb 2014 19:34:02 +0000 (-0800) Subject: meta-flow: Fix setting MFF_IP_FRAG. X-Git-Tag: sliver-openvswitch-2.1.90-1~1^2~65 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=c8abb8afc5e2b4d0dda2ee590ca64bcb4b2a1d47 meta-flow: Fix setting MFF_IP_FRAG. mf_set_flow_value() was not setting 'flow->nw_frag' properly. Signed-off-by: Jarno Rajahalme --- diff --git a/lib/meta-flow.c b/lib/meta-flow.c index d08daccd3..3afcd4cde 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1755,7 +1755,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_IP_FRAG: - flow->nw_frag &= value->u8; + flow->nw_frag = value->u8 & FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 8dcd7b9d3..6a3e29cb8 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -3516,8 +3516,8 @@ for i in 1 2 3 4; do done sleep 1 AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_USED], [0], [dnl -skb_priority(0),skb_mark(0),in_port(1/0xffff),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2/255.255.255.255,dst=10.0.0.1/255.255.255.255,proto=1/0xff,tos=0/0xff,ttl=64/0xff,frag=no/0xfc),icmp(type=8,code=0), packets:3, bytes:180, used:0.0s, actions:2 -skb_priority(0),skb_mark(0),in_port(1/0xffff),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4/255.255.255.255,dst=10.0.0.3/255.255.255.255,proto=1/0xff,tos=0/0xff,ttl=64/0xff,frag=no/0xfc),icmp(type=8,code=0), packets:3, bytes:180, used:0.0s, actions:drop +skb_priority(0),skb_mark(0),in_port(1/0xffff),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0), packets:3, bytes:180, used:0.0s, actions:2 +skb_priority(0),skb_mark(0),in_port(1/0xffff),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0), packets:3, bytes:180, used:0.0s, actions:drop ]) OVS_VSWITCHD_STOP AT_CLEANUP