]> git.proxmox.com Git - mirror_ovs.git/commit - ofproto/ofproto-dpif.c
odp-util: Always serialise recirculation in upcall key.
authorJoe Stringer <joestringer@nicira.com>
Fri, 9 May 2014 01:58:32 +0000 (13:58 +1200)
committerJoe Stringer <joestringer@nicira.com>
Mon, 19 May 2014 04:25:15 +0000 (16:25 +1200)
commit7ce2769e0c338af6164d4f8c0f2670b9f7423235
tree31735b94e47d0168fc9b36206875c837198005ca
parentf3d1349e371c54a5dbc0ce28afad7855fa2a9763
odp-util: Always serialise recirculation in upcall key.

The userspace and kernel datapaths previously differed on their
treatment of the recirc_id and dp_hash fields when sending upcalls.
While the kernel datapath would always serialise these fields, the
userspace would not. When using the userspace datapath, this would cause
a mismatch between the odp flow key in an upcall compared to the one
that is serialised upon flow_dump.

This patch brings the userspace datapath behaviour back in line with the
kernel datapath by always serialising recirc_id and dp_hash to odp.

Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
lib/dpif-netdev.c
lib/odp-util.c
lib/odp-util.h
ofproto/ofproto-dpif-upcall.c
ofproto/ofproto-dpif.c
tests/odp.at
tests/ofproto-dpif.at
tests/test-odp.c