Commit 4bd97d51 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

net: dev: rename queue selection helpers. 



With the following patches, we are going to use __netdev_pick_tx() in
many modules. Rename it to netdev_pick_tx(), to make it clear is
a public API.

Also rename the existing netdev_pick_tx() to netdev_core_pick_tx(),
to avoid name clashes.

Suggested-by: default avatarEric Dumazet <edumazet@google.com>
Suggested-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b963ef2

include/linux/netdevice.h

+3 −3
Original line number Diff line number Diff line
@@ -2152,7 +2152,7 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev, 
				  &qdisc_xmit_lock_key);	\

}



struct netdev_queue *netdev_pick_tx(struct net_device *dev,

struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,

					 struct sk_buff *skb,

					 struct net_device *sb_dev);

net/core/dev.c

+9 −9
Original line number Diff line number Diff line
@@ -3704,7 +3704,7 @@ u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb, 
}

EXPORT_SYMBOL(dev_pick_tx_cpu_id);



static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,

static u16 netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,

			  struct net_device *sb_dev)

{

	struct sock *sk = skb->sk;
@@ -3730,7 +3730,7 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb, 
	return queue_index;

}



struct netdev_queue *netdev_pick_tx(struct net_device *dev,

struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,

					 struct sk_buff *skb,

					 struct net_device *sb_dev)

{
@@ -3748,9 +3748,9 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev, 


		if (ops->ndo_select_queue)

			queue_index = ops->ndo_select_queue(dev, skb, sb_dev,

							    __netdev_pick_tx);

							    netdev_pick_tx);

		else

			queue_index = __netdev_pick_tx(dev, skb, sb_dev);

			queue_index = netdev_pick_tx(dev, skb, sb_dev);



		queue_index = netdev_cap_txqueue(dev, queue_index);

	}
@@ -3824,7 +3824,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) 
	else

		skb_dst_force(skb);



	txq = netdev_pick_tx(dev, skb, sb_dev);

	txq = netdev_core_pick_tx(dev, skb, sb_dev);

	q = rcu_dereference_bh(txq->qdisc);



	trace_net_dev_queue(skb);
@@ -4429,7 +4429,7 @@ void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog) 
	bool free_skb = true;

	int cpu, rc;



	txq = netdev_pick_tx(dev, skb, NULL);

	txq = netdev_core_pick_tx(dev, skb, NULL);

	cpu = smp_processor_id();

	HARD_TX_LOCK(dev, txq, cpu);

	if (!netif_xmit_stopped(txq)) {

net/core/netpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, 
	if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {

		struct netdev_queue *txq;



		txq = netdev_pick_tx(dev, skb, NULL);

		txq = netdev_core_pick_tx(dev, skb, NULL);



		/* try until next clock tick */

		for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;

net/xfrm/xfrm_device.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ void xfrm_dev_resume(struct sk_buff *skb) 
	unsigned long flags;



	rcu_read_lock();

	txq = netdev_pick_tx(dev, skb, NULL);

	txq = netdev_core_pick_tx(dev, skb, NULL);



	HARD_TX_LOCK(dev, txq, smp_processor_id());

	if (!netif_xmit_frozen_or_stopped(txq))

CRA Git | Maintained and supported by SUSTech CRA and CCSE