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

Commit 14e83bf8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sched-block-callbacks-follow-up' 



Jiri Pirko says:

====================
net: sched: block callbacks follow-up

This patchset does a bit of cleanup of leftovers after block callbacks
patchset. The main part is patch 2, which restores the original handling
of tc offload feature flag.

---
v1->v2:
- rebased on top of current net-next (bnxt changes)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92899063 70b5aee4

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

+1 −1
Original line number Diff line number Diff line
@@ -7347,7 +7347,7 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
{

	struct bnxt *bp = cb_priv;



	if (!bnxt_tc_flower_enabled(bp))

	if (!bnxt_tc_flower_enabled(bp) || !tc_can_offload(bp->dev))

		return -EOPNOTSUPP;



	switch (type) {

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, 
	struct bnxt *bp = vf_rep->bp;

	int vf_fid = bp->pf.vf[vf_rep->vf_idx].fw_fid;



	if (!bnxt_tc_flower_enabled(vf_rep->bp))

	if (!bnxt_tc_flower_enabled(vf_rep->bp) || !tc_can_offload(bp->dev))

		return -EOPNOTSUPP;



	switch (type) {

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

+3 −0
Original line number Diff line number Diff line
@@ -2943,6 +2943,9 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
		return -EINVAL;

	}



	if (!tc_can_offload(dev))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSU32:

		return cxgb_setup_tc_cls_u32(dev, type_data);

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −0
Original line number Diff line number Diff line
@@ -9386,6 +9386,9 @@ static int ixgbe_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
{

	struct ixgbe_adapter *adapter = cb_priv;



	if (!tc_can_offload(adapter->netdev))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSU32:

		return ixgbe_setup_tc_cls_u32(adapter, type_data);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+3 −0
Original line number Diff line number Diff line
@@ -3106,6 +3106,9 @@ int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
{

	struct mlx5e_priv *priv = cb_priv;



	if (!tc_can_offload(priv->netdev))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return mlx5e_setup_tc_cls_flower(priv, type_data);