diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-09 22:55:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-09 14:38:50 -0700 |
| commit | 955bcb6ea0df0d9ace89ac475405f1295ced5962 (patch) | |
| tree | 87f4ec27a73d992423c2c7388100cace5ed6eeb7 /include | |
| parent | 59094b1e5094c7e50a3d2912202fd30b6a1dadf8 (diff) | |
| download | linux-stable-955bcb6ea0df0d9ace89ac475405f1295ced5962.tar.gz linux-stable-955bcb6ea0df0d9ace89ac475405f1295ced5962.tar.bz2 linux-stable-955bcb6ea0df0d9ace89ac475405f1295ced5962.zip | |
drivers: net: use flow block API
This patch updates flow_block_cb_setup_simple() to use the flow block API.
Several drivers are also adjusted to use it.
This patch introduces the per-driver list of flow blocks to account for
blocks that are already in use.
Remove tc_block_offload alias.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/flow_offload.h | 3 | ||||
| -rw-r--r-- | include/net/pkt_cls.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 3fb9cc4da63e..377ba0004370 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -249,13 +249,12 @@ enum flow_block_binder_type { FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS, }; -struct tcf_block; struct netlink_ext_ack; struct flow_block_offload { enum flow_block_command command; enum flow_block_binder_type binder_type; - struct tcf_block *block; + bool block_shared; struct net *net; struct list_head cb_list; struct list_head *driver_block_list; diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index e4499526fde8..9cf606b88526 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -26,8 +26,6 @@ struct tcf_walker { int register_tcf_proto_ops(struct tcf_proto_ops *ops); int unregister_tcf_proto_ops(struct tcf_proto_ops *ops); -#define tc_block_offload flow_block_offload - struct tcf_block_ext_info { enum flow_block_binder_type binder_type; tcf_chain_head_change_t *chain_head_change; |