From: David S. Miller Date: Wed, 7 Oct 2015 12:03:16 +0000 (-0700) Subject: Merge branch 'ovs-ct-fixes' X-Git-Tag: firefly_0821_release~176^2~903^2~34 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=41747509b437dcca880b52a035453f5e4ba14aa4;p=firefly-linux-kernel-4.4.55.git Merge branch 'ovs-ct-fixes' Joe Stringer says: ==================== OVS conntrack fixes for net The userspace side of the Open vSwitch conntrack changes is currently undergoing review, which has highlighted some minor bugs in the existing conntrack implementation in the kernel, as well as pointing out some future-proofing that can be done on the interface to reduce the need for additional compatibility code in future. The biggest changes here are to the userspace API for the ct_state match field and the CT action. This series proposes to firstly extend the ct_state match field to 32 bits, ensuring to reject any currently unsupported bits. Secondly, rather than representing CT action flags within a 32-bit field, simply use a netlink attribute as presence of the single flag that is defined today. This also serves to reject unsupported ct action flag bits. v4: Use 12-character abbreviated hashes in commit messages. v3: Fully acked. v2: Address minor style feedback, add acks. v1: Initial post. ==================== Signed-off-by: David S. Miller --- 41747509b437dcca880b52a035453f5e4ba14aa4