]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ovs-conntrack'
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 18:40:44 +0000 (11:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 18:40:44 +0000 (11:40 -0700)
commit114a8eeee576bfbfabe9465f6b18b0b479011ac7
tree11d4fe2287105c7009e4c1c27d5d722658d2374b
parent0d071072d7efddbdac8d0c555032795d3d8326c3
parent4b4669d7e5b80619af5c6b6462b60ef787c6d47d
Merge branch 'ovs-conntrack'

Joe Stringer says:

====================
OVS conntrack support

The goal of this series is to allow OVS to send packets through the Linux
kernel connection tracker, and subsequently match on fields populated by
conntrack. This functionality is enabled through a new
CONFIG_OPENVSWITCH_CONNTRACK option.

This version addresses the feedback from v5, primarily checking the behaviour
is correct with different configurations such as disabling
CONFIG_OPENVSWITCH_CONNTRACK or disabling individual conntrack features like
connlabels.

The branch below has been updated with the corresponding userspace pieces:
https://github.com/joestringer/ovs dev/ct_20150818
====================

Signed-off-by: David S. Miller <davem@davemloft.net>