Re: [PATCH net-next] hip04_eth: fix missing error handle for build_skb failed

From: Ding Tianhong
Date: Tue Jan 12 2016 - 22:49:45 EST


On 2016/1/13 11:11, Weidong Wang wrote:
> when build_skb failed, we should goto refill the buffer.
>
> Signed-off-by: Weidong Wang <wangweidong1@xxxxxxxxxx>
> ---

Acked-by: Ding Tainhong <dingtianhong@xxxxxxxxxx>

> drivers/net/ethernet/hisilicon/hip04_eth.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
> index 3b39fdd..417f131 100644
> --- a/drivers/net/ethernet/hisilicon/hip04_eth.c
> +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
> @@ -500,8 +500,10 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
> while (cnt && !last) {
> buf = priv->rx_buf[priv->rx_head];
> skb = build_skb(buf, priv->rx_buf_size);
> - if (unlikely(!skb))
> + if (unlikely(!skb)) {
> net_dbg_ratelimited("build_skb failed\n");
> + goto refill;
> + }
>
> dma_unmap_single(&ndev->dev, priv->rx_phys[priv->rx_head],
> RX_BUF_SIZE, DMA_FROM_DEVICE);
> @@ -528,6 +530,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
> rx++;
> }
>
> +refill:
> buf = netdev_alloc_frag(priv->rx_buf_size);
> if (!buf)
> goto done;
>