Re: [PATCH] virtio_net: Remove BUG() to aviod machine dead

Stefano Garzarella
2021-05-20T07:35:45Z

If you need to respin, there is a typo in the title s/aviod/avoid/

On Tue, May 18, 2021 at 05:46:56PM +0800, Xianting Tian wrote:
>When met error, we output a print to avoid a BUG().
>
>Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
>---
> 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..a66174d13e81 100644
>--- a/drivers/net/virtio_net.c
>+++ b/drivers/net/virtio_net.c
>@@ -1647,9 +1647,8 @@ static int xmit_skb(struct send_queue *sq,
>struct sk_buff *skb)
> hdr = skb_vnet_hdr(skb);
>
> if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
>- virtio_is_little_endian(vi->vdev), false,
>- 0))
>- BUG();
>+ virtio_is_little_endian(vi->vdev), false, 0))
^
This change is not related.

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