]> 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)
commit1f3f187bd93a2da4eb381f7a84694059d6382e03
tree11d4fe2287105c7009e4c1c27d5d722658d2374b
parenta45ea666d5e1ebda0901578c28c73b37c2495b8d
parent33f290f713117b45db6dd1b768fc5a8c8ec22d3b
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>