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

Commit 9cf1f6a8 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

net: Move functions for configuring traffic classes out of inline headers 



The functions for configuring the traffic class to queue mappings have
other effects that need to be addressed.  Instead of trying to export a
bunch of new functions just relocate the functions so that we can
instrument them directly with the functionality they will need.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20861f26

include/linux/netdevice.h

+3 −28
Original line number Diff line number Diff line
@@ -1920,34 +1920,9 @@ int netdev_set_prio_tc_map(struct net_device *dev, u8 prio, u8 tc) 
	return 0;

}



static inline

void netdev_reset_tc(struct net_device *dev)

{

	dev->num_tc = 0;

	memset(dev->tc_to_txq, 0, sizeof(dev->tc_to_txq));

	memset(dev->prio_tc_map, 0, sizeof(dev->prio_tc_map));

}



static inline

int netdev_set_tc_queue(struct net_device *dev, u8 tc, u16 count, u16 offset)

{

	if (tc >= dev->num_tc)

		return -EINVAL;



	dev->tc_to_txq[tc].count = count;

	dev->tc_to_txq[tc].offset = offset;

	return 0;

}



static inline

int netdev_set_num_tc(struct net_device *dev, u8 num_tc)

{

	if (num_tc > TC_MAX_QUEUE)

		return -EINVAL;



	dev->num_tc = num_tc;

	return 0;

}

void netdev_reset_tc(struct net_device *dev);

int netdev_set_tc_queue(struct net_device *dev, u8 tc, u16 count, u16 offset);

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



static inline

int netdev_get_num_tc(struct net_device *dev)

net/core/dev.c

+29 −0
Original line number Diff line number Diff line
@@ -2173,6 +2173,35 @@ int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask, 
EXPORT_SYMBOL(netif_set_xps_queue);



#endif

void netdev_reset_tc(struct net_device *dev)

{

	dev->num_tc = 0;

	memset(dev->tc_to_txq, 0, sizeof(dev->tc_to_txq));

	memset(dev->prio_tc_map, 0, sizeof(dev->prio_tc_map));

}

EXPORT_SYMBOL(netdev_reset_tc);



int netdev_set_tc_queue(struct net_device *dev, u8 tc, u16 count, u16 offset)

{

	if (tc >= dev->num_tc)

		return -EINVAL;



	dev->tc_to_txq[tc].count = count;

	dev->tc_to_txq[tc].offset = offset;

	return 0;

}

EXPORT_SYMBOL(netdev_set_tc_queue);



int netdev_set_num_tc(struct net_device *dev, u8 num_tc)

{

	if (num_tc > TC_MAX_QUEUE)

		return -EINVAL;



	dev->num_tc = num_tc;

	return 0;

}

EXPORT_SYMBOL(netdev_set_num_tc);



/*

 * Routine to help set real_num_tx_queues. To avoid skbs mapped to queues

 * greater then real_num_tx_queues stale skbs on the qdisc must be flushed.