Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59094b1e

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+4 −1
Original line number Diff line number Diff line
@@ -9907,6 +9907,8 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
	}

}



static LIST_HEAD(bnxt_block_cb_list);



static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,

			 void *type_data)

{
@@ -9914,7 +9916,8 @@ static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type, 


	switch (type) {

	case TC_SETUP_BLOCK:

		return flow_block_cb_setup_simple(type_data, NULL,

		return flow_block_cb_setup_simple(type_data,

						  &bnxt_block_cb_list,

						  bnxt_setup_tc_block_cb,

						  bp, bp, true);

	case TC_SETUP_QDISC_MQPRIO: {

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+4 −1
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, 
	}

}



static LIST_HEAD(bnxt_vf_block_cb_list);



static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type,

				void *type_data)

{
@@ -168,7 +170,8 @@ static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type, 


	switch (type) {

	case TC_SETUP_BLOCK:

		return flow_block_cb_setup_simple(type_data, NULL,

		return flow_block_cb_setup_simple(type_data,

						  &bnxt_vf_block_cb_list,

						  bnxt_vf_rep_setup_tc_block_cb,

						  vf_rep, vf_rep, true);

	default:

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+4 −1
Original line number Diff line number Diff line
@@ -3190,6 +3190,8 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
	}

}



static LIST_HEAD(cxgb_block_cb_list);



static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,

			 void *type_data)

{
@@ -3197,7 +3199,8 @@ static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type, 


	switch (type) {

	case TC_SETUP_BLOCK:

		return flow_block_cb_setup_simple(type_data, NULL,

		return flow_block_cb_setup_simple(type_data,

						  &cxgb_block_cb_list,

						  cxgb_setup_tc_block_cb,

						  pi, dev, true);

	default:

drivers/net/ethernet/intel/i40e/i40e_main.c

+4 −1
Original line number Diff line number Diff line
@@ -8177,6 +8177,8 @@ static int i40e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
	}

}



static LIST_HEAD(i40e_block_cb_list);



static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type,

			   void *type_data)

{
@@ -8186,7 +8188,8 @@ static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type, 
	case TC_SETUP_QDISC_MQPRIO:

		return i40e_setup_tc(netdev, type_data);

	case TC_SETUP_BLOCK:

		return flow_block_cb_setup_simple(type_data, NULL,

		return flow_block_cb_setup_simple(type_data,

						  &i40e_block_cb_list,

						  i40e_setup_tc_block_cb,

						  np, np, true);

	default:

drivers/net/ethernet/intel/iavf/iavf_main.c

+4 −1
Original line number Diff line number Diff line
@@ -3113,6 +3113,8 @@ static int iavf_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
	}

}



static LIST_HEAD(iavf_block_cb_list);



/**

 * iavf_setup_tc - configure multiple traffic classes

 * @netdev: network interface device structure
@@ -3133,7 +3135,8 @@ static int iavf_setup_tc(struct net_device *netdev, enum tc_setup_type type, 
	case TC_SETUP_QDISC_MQPRIO:

		return __iavf_setup_tc(netdev, type_data);

	case TC_SETUP_BLOCK:

		return flow_block_cb_setup_simple(type_data, NULL,

		return flow_block_cb_setup_simple(type_data,

						  &iavf_block_cb_list,

						  iavf_setup_tc_block_cb,

						  adapter, adapter, true);

	default: