On Wed, Jun 29, 2016 at 7:14 AM, Joe Stringer <j...@ovn.org> wrote: > On 29 June 2016 at 15:35, Jarno Rajahalme <ja...@ovn.org> wrote: >> Upstream commit: >> commit 7d904c7bcd51f72579c0c3134a50896c5a3efb9f >> Author: Jarno Rajahalme <ja...@ovn.org> >> Date: Tue Jun 21 14:59:38 2016 -0700 >> >> openvswitch: Only set mark and labels with a commit flag. >> >> Only set conntrack mark or labels when the commit flag is specified. >> This makes sure we can not set them before the connection has been >> persisted, as in that case the mark and labels would be lost in an >> event of an userspace upcall. >> >> OVS userspace already requires the commit flag to accept setting >> ct_mark and/or ct_labels. Validate for this in the kernel API. >> >> Signed-off-by: Jarno Rajahalme <ja...@ovn.org> >> Signed-off-by: David S. Miller <da...@davemloft.net> >> >> Signed-off-by: Jarno Rajahalme <ja...@ovn.org> > > Acked-by: Joe Stringer <j...@ovn.org>
I pushed both patches to master. The patch did not apply cleanly to 2.5, so I sent out branch-2.5 patch for review. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
