Commit 278fda0d authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

net: remove __skb_frag_set_page() 



The remaining users calling __skb_frag_set_page() with
page being NULL seems to be doing defensive programming,
as shinfo->nr_frags is already decremented, so remove
them.

Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b51f4113

drivers/net/ethernet/broadcom/bnx2.c

+0 −1
Original line number Diff line number Diff line
@@ -2955,7 +2955,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, 
		shinfo = skb_shinfo(skb);

		shinfo->nr_frags--;

		page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]);

		__skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL);



		cons_rx_pg->page = page;

		dev_kfree_skb(skb);

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −4
Original line number Diff line number Diff line
@@ -1102,10 +1102,7 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp, 
			xdp_buff_set_frag_pfmemalloc(xdp);



		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) {

			unsigned int nr_frags;



			nr_frags = --shinfo->nr_frags;

			__skb_frag_set_page(&shinfo->frags[nr_frags], NULL);

			--shinfo->nr_frags;

			cons_rx_buf->page = page;



			/* Update prod since possibly some pages have been

include/linux/skbuff.h

+0 −12
Original line number Diff line number Diff line
@@ -3491,18 +3491,6 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto, 
	fragto->bv_page = fragfrom->bv_page;

}



/**

 * __skb_frag_set_page - sets the page contained in a paged fragment

 * @frag: the paged fragment

 * @page: the page to set

 *

 * Sets the fragment @frag to contain @page.

 */

static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)

{

	frag->bv_page = page;

}



bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);



/**