[ovs-git] [openvswitch/ovs] 429fa8: datapath: Respect conntrack zone even if invalid.

GitHub noreply at github.com
Fri Dec 11 00:17:05 UTC 2015


  Branch: refs/heads/branch-2.5
  Home:   https://github.com/openvswitch/ovs
  Commit: 429fa845467a232452e10dace3b2b7a32a284a63
      https://github.com/openvswitch/ovs/commit/429fa845467a232452e10dace3b2b7a32a284a63
  Author: Joe Stringer <joe at ovn.org>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M datapath/conntrack.c

  Log Message:
  -----------
  datapath: Respect conntrack zone even if invalid.

If userspace executes ct(zone=1), and the connection tracker determines
that the packet is invalid, then the ct_zone flow key field is populated
with the default zone rather than the zone that was specified. Even
though connection tracking failed, this field should be updated with the
value that userspace specified. Fix the issue.

Fixes: a94ebc39996b ("datapath: Add conntrack action")
Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at nicira.com>


  Commit: 41d238bb545c59fc8e5ade1a5ee9373b0be2fd81
      https://github.com/openvswitch/ovs/commit/41d238bb545c59fc8e5ade1a5ee9373b0be2fd81
  Author: Joe Stringer <joe at ovn.org>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h

  Log Message:
  -----------
  datapath: Define nf_connlabels_{put,get}.

Previously this was only done when connlabels were enabled in the kernel
config, even if the functions didn't exist. Fix the compile error.

Fixes: b8cce81fa9a1 ("compat: Backport nf_connlabels_{get, put}().")
Reported-by: Simon Horman <simon.horman at netronome.com>
Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Pravin B Shelar <pshelar at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/b5f3bc20ba17...41d238bb545c


More information about the git mailing list