Message ID | 20240408153000.2152844-4-almasrymina@google.com (mailing list archive) |
---|---|
State | Superseded |
Commit | f58f3c9563409e618e591d0d540316286cb0665f |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | Minor cleanups to skb frag ref/unref | expand |
On 4/8/2024 8:29 AM, Mina Almasry wrote: > With the changes in the last patches, napi_frag_unref() is now > reduandant. Remove it and use skb_page_unref directly. > > Signed-off-by: Mina Almasry <almasrymina@google.com> > Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> > Reviewed-by: Eric Dumazet <edumazet@google.com> > Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2e6a77c398e6..182371f4834d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3567,12 +3567,6 @@ skb_page_unref(struct page *page, bool recycle) put_page(page); } -static inline void -napi_frag_unref(skb_frag_t *frag, bool recycle) -{ - skb_page_unref(skb_frag_page(frag), recycle); -} - /** * __skb_frag_unref - release a reference on a paged fragment. * @frag: the paged fragment @@ -3583,7 +3577,7 @@ napi_frag_unref(skb_frag_t *frag, bool recycle) */ static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle) { - napi_frag_unref(frag, recycle); + skb_page_unref(skb_frag_page(frag), recycle); } /** diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 928c615b0fd8..38c20b44cb14 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1065,7 +1065,7 @@ static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason) } for (i = 0; i < shinfo->nr_frags; i++) - napi_frag_unref(&shinfo->frags[i], skb->pp_recycle); + __skb_frag_unref(&shinfo->frags[i], skb->pp_recycle); free_head: if (shinfo->frag_list)