Hi, The following patchset contains fixes for the flow_offload infrastructure: 1) Fix possible build breakage before patch 3/4. Both the flow_offload infrastructure and OVS define the flow_stats structure. Patch 3/4 in this batch indirectly pulls in the flow_stats definition from include/net/flow_offload.h into OVS, leading to structure redefinition compile-time errors. 2) Remove netns parameter from flow_block_cb_alloc(), this is not required as Jiri suggests. The flow_block_cb_is_busy() function uses the per-driver block list to check for used blocks which was the original intention for this parameter. 3) Rename tc_setup_cb_t to flow_setup_cb_t. This callback is not exclusive of tc anymore, this might confuse the reader as Jiri suggests, fix this semantic inconsistency. Add #include <linux/list.h> to include/net/netfilter/nf_tables_offload.h to avoid a compile break with CONFIG_HEADER_TEST=y. 4) Fix block sharing feature: Add flow_block structure and use it, update flow_block_cb_lookup() to use this flow_block object. Please, apply, thank you. Pablo Neira Ayuso (4): net: openvswitch: rename flow_stats to sw_flow_stats net: flow_offload: remove netns parameter from flow_block_cb_alloc() net: flow_offload: rename tc_setup_cb_t to flow_setup_cb_t net: flow_offload: add flow_block structure and use it drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 ++-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 15 ++++++----- drivers/net/ethernet/mscc/ocelot_flower.c | 11 ++++---- drivers/net/ethernet/mscc/ocelot_tc.c | 6 ++--- .../net/ethernet/netronome/nfp/flower/offload.c | 11 ++++---- include/net/flow_offload.h | 30 ++++++++++++++++------ include/net/netfilter/nf_tables.h | 5 ++-- include/net/pkt_cls.h | 5 ++-- include/net/sch_generic.h | 8 +++--- net/core/flow_offload.c | 22 ++++++++-------- net/dsa/slave.c | 6 ++--- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nf_tables_offload.c | 5 ++-- net/openvswitch/flow.c | 8 +++--- net/openvswitch/flow.h | 4 +-- net/openvswitch/flow_table.c | 8 +++--- net/sched/cls_api.c | 12 ++++++--- net/sched/cls_bpf.c | 2 +- net/sched/cls_flower.c | 2 +- net/sched/cls_matchall.c | 2 +- net/sched/cls_u32.c | 6 ++--- 21 files changed, 94 insertions(+), 81 deletions(-) -- 2.11.0
