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: Yunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 466e1d62bcf6ea0bebeb40652987c1734a710da3..0d917a9699c586809ed6529bc01366a0bee17f29 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -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);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index efaff5018af8b92bf1fecbc1470d927ff4ab20a0..f42e51bd3e4257d65c0ef8ed885c9709e7b327fe 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -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

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 30be21c7d05f286af6ab8adc5ed0f670ddccab26..00e8c435fa1a26ecbb6c390ff2eeb674589abf6f 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -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);
 
 /**