nfp: flower-ct: implement code to save merge of tc and nft flows
authorLouis Peens <louis.peens@corigine.com>
Wed, 16 Jun 2021 10:02:04 +0000 (12:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2021 19:42:52 +0000 (12:42 -0700)
commita6ffdd3a0e47fb8da9b6f3a8fae9f473644b94e0
tree8592b1b12dae8b0466aeab35f624661f0bc99ee4
parentb5e30c61d8cbd1002ac3456e29952b8c78bc542f
nfp: flower-ct: implement code to save merge of tc and nft flows

Add in the code to merge the tc_merge objects with the flows
received from nft. At the moment flows are just merged blindly
as the validity check functions are stubbed out, this will
be populated in follow-up patches.

Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/flower/conntrack.c