summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/netronome/nfp/flower/main.h
diff options
context:
space:
mode:
authorJohn Hurley2019-04-15 16:55:59 +0200
committerDavid S. Miller2019-04-16 00:45:36 +0200
commitdbc2d68edc987cd9941428c0845641c64737c3ee (patch)
treecc290ce81fd138d5ab419052b15ba5abfff35dab /drivers/net/ethernet/netronome/nfp/flower/main.h
parentnfp: flower: get flows by host context (diff)
downloadkernel-qcow2-linux-dbc2d68edc987cd9941428c0845641c64737c3ee.tar.gz
kernel-qcow2-linux-dbc2d68edc987cd9941428c0845641c64737c3ee.tar.xz
kernel-qcow2-linux-dbc2d68edc987cd9941428c0845641c64737c3ee.zip
nfp: flower: handle merge hint messages
If a merge hint is received containing 2 flows that are matched via an implicit recirculation (sending to and matching on an internal port), fw reports that the flows (called sub_flows) may be able to be combined to a single flow. Add infastructure to accept and process merge hint messages. The actual merging of the flows is left as a stub call. Signed-off-by: John Hurley <john.hurley@netronome.com> Signed-off-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/flower/main.h')
-rw-r--r--drivers/net/ethernet/netronome/nfp/flower/main.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index 9b34264197c2..311daffb897d 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -285,6 +285,9 @@ void nfp_flower_metadata_cleanup(struct nfp_app *app);
int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
enum tc_setup_type type, void *type_data);
+int nfp_flower_merge_offloaded_flows(struct nfp_app *app,
+ struct nfp_fl_payload *sub_flow1,
+ struct nfp_fl_payload *sub_flow2);
int nfp_flower_compile_flow_match(struct nfp_app *app,
struct tc_cls_flower_offload *flow,
struct nfp_fl_key_ls *key_ls,