Commit a7323311 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

net: flow_offload: rename tc_setup_cb_t to flow_setup_cb_t 



Rename this type definition and adapt users.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c7294dd

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+1 −1
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
				   struct flow_block_offload *f)

{

	struct flow_block_cb *block_cb;

	tc_setup_cb_t *cb;

	flow_setup_cb_t *cb;

	bool ingress;

	int err;

drivers/net/ethernet/mscc/ocelot_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 
				 struct flow_block_offload *f)

{

	struct flow_block_cb *block_cb;

	tc_setup_cb_t *cb;

	flow_setup_cb_t *cb;

	int err;



	netdev_dbg(port->dev, "tc_block command %d, binder_type %d\n",

include/net/flow_offload.h

+11 −6
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _NET_FLOW_OFFLOAD_H



#include <linux/kernel.h>

#include <linux/list.h>

#include <net/flow_dissector.h>

#include <net/sch_generic.h>



struct flow_match {

	struct flow_dissector	*dissector;
@@ -261,23 +261,27 @@ struct flow_block_offload { 
	struct netlink_ext_ack *extack;

};



enum tc_setup_type;

typedef int flow_setup_cb_t(enum tc_setup_type type, void *type_data,

			    void *cb_priv);



struct flow_block_cb {

	struct list_head	driver_list;

	struct list_head	list;

	tc_setup_cb_t		*cb;

	flow_setup_cb_t		*cb;

	void			*cb_ident;

	void			*cb_priv;

	void			(*release)(void *cb_priv);

	unsigned int		refcnt;

};



struct flow_block_cb *flow_block_cb_alloc(tc_setup_cb_t *cb,

struct flow_block_cb *flow_block_cb_alloc(flow_setup_cb_t *cb,

					  void *cb_ident, void *cb_priv,

					  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,

					   tc_setup_cb_t *cb, void *cb_ident);

					   flow_setup_cb_t *cb, void *cb_ident);



void *flow_block_cb_priv(struct flow_block_cb *block_cb);

void flow_block_cb_incref(struct flow_block_cb *block_cb);
@@ -295,11 +299,12 @@ static inline void flow_block_cb_remove(struct flow_block_cb *block_cb, 
	list_move(&block_cb->list, &offload->cb_list);

}



bool flow_block_cb_is_busy(tc_setup_cb_t *cb, void *cb_ident,

bool flow_block_cb_is_busy(flow_setup_cb_t *cb, void *cb_ident,

			   struct list_head *driver_block_list);



int flow_block_cb_setup_simple(struct flow_block_offload *f,

			       struct list_head *driver_list, tc_setup_cb_t *cb,

			       struct list_head *driver_list,

			       flow_setup_cb_t *cb,

			       void *cb_ident, void *cb_priv, bool ingress_only);



enum flow_cls_command {

include/net/pkt_cls.h

+2 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/workqueue.h>

#include <net/sch_generic.h>

#include <net/act_api.h>

#include <net/flow_offload.h>

#include <net/net_namespace.h>



/* TC action not accessible from user space */
@@ -126,14 +125,14 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block) 
}



static inline

int tc_setup_cb_block_register(struct tcf_block *block, tc_setup_cb_t *cb,

int tc_setup_cb_block_register(struct tcf_block *block, flow_setup_cb_t *cb,

			       void *cb_priv)

{

	return 0;

}



static inline

void tc_setup_cb_block_unregister(struct tcf_block *block, tc_setup_cb_t *cb,

void tc_setup_cb_block_unregister(struct tcf_block *block, flow_setup_cb_t *cb,

				  void *cb_priv)

{

}

include/net/sch_generic.h

+2 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/mutex.h>

#include <net/gen_stats.h>

#include <net/rtnetlink.h>

#include <net/flow_offload.h>



struct Qdisc_ops;

struct qdisc_walker;
@@ -22,9 +23,6 @@ struct tcf_walker; 
struct module;

struct bpf_flow_keys;



typedef int tc_setup_cb_t(enum tc_setup_type type,

			  void *type_data, void *cb_priv);



typedef int tc_indr_block_bind_cb_t(struct net_device *dev, void *cb_priv,

				    enum tc_setup_type type, void *type_data);
@@ -313,7 +311,7 @@ struct tcf_proto_ops { 
	void			(*walk)(struct tcf_proto *tp,

					struct tcf_walker *arg, bool rtnl_held);

	int			(*reoffload)(struct tcf_proto *tp, bool add,

					     tc_setup_cb_t *cb, void *cb_priv,

					     flow_setup_cb_t *cb, void *cb_priv,

					     struct netlink_ext_ack *extack);

	void			(*bind_class)(void *, u32, unsigned long);

	void *			(*tmplt_create)(struct net *net,