net: flow_offload: add flow_block structure and use it
This object stores the flow block callbacks that are attached to this
block. Update flow_block_cb_lookup() to take this new object.
This patch restores the block sharing feature.
Fixes: da3eeb904f
("net: flow_offload: add list handling functions")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
a732331151
commit
14bfb13f0e
@@ -249,6 +249,10 @@ enum flow_block_binder_type {
|
||||
FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS,
|
||||
};
|
||||
|
||||
struct flow_block {
|
||||
struct list_head cb_list;
|
||||
};
|
||||
|
||||
struct netlink_ext_ack;
|
||||
|
||||
struct flow_block_offload {
|
||||
@@ -256,6 +260,7 @@ struct flow_block_offload {
|
||||
enum flow_block_binder_type binder_type;
|
||||
bool block_shared;
|
||||
struct net *net;
|
||||
struct flow_block *block;
|
||||
struct list_head cb_list;
|
||||
struct list_head *driver_block_list;
|
||||
struct netlink_ext_ack *extack;
|
||||
@@ -280,7 +285,7 @@ struct flow_block_cb *flow_block_cb_alloc(flow_setup_cb_t *cb,
|
||||
void (*release)(void *cb_priv));
|
||||
void flow_block_cb_free(struct flow_block_cb *block_cb);
|
||||
|
||||
struct flow_block_cb *flow_block_cb_lookup(struct flow_block_offload *offload,
|
||||
struct flow_block_cb *flow_block_cb_lookup(struct flow_block *block,
|
||||
flow_setup_cb_t *cb, void *cb_ident);
|
||||
|
||||
void *flow_block_cb_priv(struct flow_block_cb *block_cb);
|
||||
@@ -337,4 +342,9 @@ flow_cls_offload_flow_rule(struct flow_cls_offload *flow_cmd)
|
||||
return flow_cmd->rule;
|
||||
}
|
||||
|
||||
static inline void flow_block_init(struct flow_block *flow_block)
|
||||
{
|
||||
INIT_LIST_HEAD(&flow_block->cb_list);
|
||||
}
|
||||
|
||||
#endif /* _NET_FLOW_OFFLOAD_H */
|
||||
|
Reference in New Issue
Block a user