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

Commit e4c6734e authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

net: rework ndo tc op to consume additional qdisc handle parameter 



The ndo_setup_tc() op was added to support drivers offloading tx
qdiscs however only support for mqprio was ever added. So we
only ever added support for passing the number of traffic classes
to the driver.

This patch generalizes the ndo_setup_tc op so that a handle can
be provided to indicate if the offload is for ingress or egress
or potentially even child qdiscs.

CC: Murali Karicheri <m-karicheri2@ti.com>
CC: Shradha Shah <sshah@solarflare.com>
CC: Or Gerlitz <ogerlitz@mellanox.com>
CC: Ariel Elior <ariel.elior@qlogic.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Bruce Allan <bruce.w.allan@intel.com>
CC: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 547b9ca8

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+4 −1
Original line number Diff line number Diff line
@@ -1626,12 +1626,15 @@ static void xgbe_poll_controller(struct net_device *netdev) 
}

#endif /* End CONFIG_NET_POLL_CONTROLLER */



static int xgbe_setup_tc(struct net_device *netdev, u8 tc)

static int xgbe_setup_tc(struct net_device *netdev, u32 handle, u8 tc)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	unsigned int offset, queue;

	u8 i;



	if (handle != TC_H_ROOT)

		return -EINVAL;



	if (tc && (tc != pdata->hw_feat.tc_cnt))

		return -EINVAL;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+7 −0
Original line number Diff line number Diff line
@@ -4272,6 +4272,13 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc) 
	return 0;

}



int __bnx2x_setup_tc(struct net_device *dev, u32 handle, u8 num_tc)

{

	if (handle != TC_H_ROOT)

		return -EINVAL;

	return bnx2x_setup_tc(dev, num_tc);

}



/* called with rtnl_lock */

int bnx2x_change_mac_addr(struct net_device *dev, void *p)

{

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev); 


/* setup_tc callback */

int bnx2x_setup_tc(struct net_device *dev, u8 num_tc);

int __bnx2x_setup_tc(struct net_device *dev, u32 handle, u8 num_tc);



int bnx2x_get_vf_config(struct net_device *dev, int vf,

			struct ifla_vf_info *ivi);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -13061,7 +13061,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= poll_bnx2x,

#endif

	.ndo_setup_tc		= bnx2x_setup_tc,

	.ndo_setup_tc		= __bnx2x_setup_tc,

#ifdef CONFIG_BNX2X_SRIOV

	.ndo_set_vf_mac		= bnx2x_set_vf_mac,

	.ndo_set_vf_vlan	= bnx2x_set_vf_vlan,

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

+4 −1
Original line number Diff line number Diff line
@@ -5370,10 +5370,13 @@ static int bnxt_change_mtu(struct net_device *dev, int new_mtu) 
	return 0;

}



static int bnxt_setup_tc(struct net_device *dev, u8 tc)

static int bnxt_setup_tc(struct net_device *dev, u32 handle, u8 tc)

{

	struct bnxt *bp = netdev_priv(dev);



	if (handle != TC_H_ROOT)

		return -EINVAL;



	if (tc > bp->max_tc) {

		netdev_err(dev, "too many traffic classes requested: %d Max supported is %d\n",

			   tc, bp->max_tc);