From: Haiyang Zhang Date: Thu, 20 Aug 2020 21:53:14 +0000 (-0700) Subject: hv_netvsc: Remove "unlikely" from netvsc_select_queue X-Git-Tag: iomap-folio-5.17-old~3329^2~8^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d820543c54c47a2bd3c95ddbf52f83c89a219a0;p=users%2Fwilly%2Flinux.git hv_netvsc: Remove "unlikely" from netvsc_select_queue When using vf_ops->ndo_select_queue, the number of queues of VF is usually bigger than the synthetic NIC. This condition may happen often. Remove "unlikely" from the comparison of ndev->real_num_tx_queues. Fixes: b3bf5666a510 ("hv_netvsc: defer queue selection to VF") Signed-off-by: Haiyang Zhang Signed-off-by: David S. Miller --- diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 787f17e2a971..0029292cdb9f 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -367,7 +367,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb, } rcu_read_unlock(); - while (unlikely(txq >= ndev->real_num_tx_queues)) + while (txq >= ndev->real_num_tx_queues) txq -= ndev->real_num_tx_queues; return txq;