Subject: Re: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 16 Apr 2021 08:05:08 +1000

Hi all,

On Thu, 15 Apr 2021 14:00:16 +0000 "Ong, Boon Leong" <[email-masked]> wrote:
>
> I check linux-next merge fix above and spotted an additional fix needed.
> Please see below. 
> 
> >+ /**
> >+  * dma_recycle_rx_skbufs - recycle RX dma buffers
> >+  * @priv: private structure
> >+  * @queue: RX queue index
> >+  */
> >+ static void dma_recycle_rx_skbufs(struct stmmac_priv *priv, u32 queue)
> >+ {
> >+ 	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
> >+ 	int i;
> >+
> >+ 	for (i = 0; i < priv->dma_rx_size; i++) {
> >+ 		struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
> >+
> >+ 		if (buf->page) {
> >+ 			page_pool_recycle_direct(rx_q->page_pool, buf-  
> >>page);  
> >+ 			buf->page = NULL;
> >+ 		}
> >+
> >+ 		if (priv->sph && buf->sec_page) {
> >+ 			page_pool_recycle_direct(rx_q->page_pool, buf-  
> >>sec_page);  
> >+ 			buf->sec_page = NULL;
> >+ 		}
> >+ 	}
> >+ }  
> 
> With https://git.kernel.org/netdev/net/c/00423969d806 that reverts
> stmmac_reinit_rx_buffers(), then the above dma_recycle_rx_skbufs()
> is no longer needed when net-next is sent for merge. 

Thanks.  I have added removal of that (now unused) function to my merge
resolution.

-- 
Cheers,
Stephen Rothwell