[PATCH] virtio_net: Use BUG_ON instead of if condition followed by BUG

From: Xianting Tian
Date: Mon May 17 2021 - 09:31:26 EST


BUG_ON() uses unlikely in if(), which can be optimized at compile time.

Signed-off-by: Xianting Tian <xianting.tian@xxxxxxxxxxxxxxxxx>
---
drivers/net/virtio_net.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index c921ebf3ae82..212d52204884 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1646,10 +1646,9 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
else
hdr = skb_vnet_hdr(skb);

- if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
+ BUG_ON(virtio_net_hdr_from_skb(skb, &hdr->hdr,
virtio_is_little_endian(vi->vdev), false,
- 0))
- BUG();
+ 0));

if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
--
2.17.1