From: David S. Miller <davem@davemloft.net>
Date: Wed, 16 Jun 2021 19:42:53 +0000 (-0700)
Subject: Merge branch 'nfp-ct-part-two'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1d24b6b4b092a510c1ade459ea814902954f404b;p=linux.git

Merge branch 'nfp-ct-part-two'

Simon Horman says:

====================
Next set of conntrack patches for the nfp driver

Louis Peens says:

This follows on from the previous series of a similar nature.
Looking at the diagram as explained in the previous series
this implements changes up to the point where the merged
nft entries are saved. There are still bits of stubbed
out code where offloading of the flows will be implemented.

	+-------------+                      +----------+
	| pre_ct flow +--------+             | nft flow |
	+-------------+        v             +------+---+
	                  +----------+              |
	                  | tc_merge +--------+     |
	                  +----------+        v     v
	+--------------+       ^           +-------------+
	| post_ct flow +-------+       +---+nft_tc merge |
	+--------------+               |   +-------------+
	                               |
	                               |
	                               |
	                               v
	                        Offload to nfp
====================

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

1d24b6b4b092a510c1ade459ea814902954f404b