From: Alexander Duyck <alexander.h.duyck@redhat.com>
To: netdev@vger.kernel.org, linux-usb@vger.kernel.org
Cc: leedom@chelsio.com, hariprasad@chelsio.com,
donald.c.skidmore@intel.com, oliver@neukum.org, balbi@ti.com,
matthew.vick@intel.com, mgorman@suse.de, davem@davemloft.net,
jeffrey.t.kirsher@intel.com
Subject: [net-next PATCH v3 5/5] net: Remove __skb_alloc_page and __skb_alloc_pages
Date: Tue, 11 Nov 2014 09:27:05 -0800 [thread overview]
Message-ID: <20141111172705.16460.42660.stgit@ahduyck-vm-fedora20> (raw)
In-Reply-To: <20141111172523.16460.16845.stgit@ahduyck-vm-fedora20>
Remove the two functions which are now dead code.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
---
include/linux/skbuff.h | 43 -------------------------------------------
1 file changed, 43 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2e5221f..73c370e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2233,49 +2233,6 @@ static inline struct page *dev_alloc_page(void)
}
/**
- * __skb_alloc_pages - allocate pages for ps-rx on a skb and preserve pfmemalloc data
- * @gfp_mask: alloc_pages_node mask. Set __GFP_NOMEMALLOC if not for network packet RX
- * @skb: skb to set pfmemalloc on if __GFP_MEMALLOC is used
- * @order: size of the allocation
- *
- * Allocate a new page.
- *
- * %NULL is returned if there is no free memory.
-*/
-static inline struct page *__skb_alloc_pages(gfp_t gfp_mask,
- struct sk_buff *skb,
- unsigned int order)
-{
- struct page *page;
-
- gfp_mask |= __GFP_COLD;
-
- if (!(gfp_mask & __GFP_NOMEMALLOC))
- gfp_mask |= __GFP_MEMALLOC;
-
- page = alloc_pages_node(NUMA_NO_NODE, gfp_mask, order);
- if (skb && page && page->pfmemalloc)
- skb->pfmemalloc = true;
-
- return page;
-}
-
-/**
- * __skb_alloc_page - allocate a page for ps-rx for a given skb and preserve pfmemalloc data
- * @gfp_mask: alloc_pages_node mask. Set __GFP_NOMEMALLOC if not for network packet RX
- * @skb: skb to set pfmemalloc on if __GFP_MEMALLOC is used
- *
- * Allocate a new page.
- *
- * %NULL is returned if there is no free memory.
- */
-static inline struct page *__skb_alloc_page(gfp_t gfp_mask,
- struct sk_buff *skb)
-{
- return __skb_alloc_pages(gfp_mask, skb, 0);
-}
-
-/**
* skb_propagate_pfmemalloc - Propagate pfmemalloc if skb is allocated after RX page
* @page: The page that was allocated from skb_alloc_page
* @skb: The skb that may need pfmemalloc set
next prev parent reply other threads:[~2014-11-11 17:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 17:26 [net-next PATCH v3 0/5] Replace __skb_alloc_pages with simpler function Alexander Duyck
2014-11-11 17:26 ` [net-next PATCH v3 1/5] net: Add device Rx page allocation function Alexander Duyck
2014-11-11 17:26 ` [net-next PATCH v3 2/5] cxgb4/cxgb4vf: Replace __skb_alloc_page with __dev_alloc_page Alexander Duyck
2014-11-11 17:26 ` [net-next PATCH v3 3/5] phonet: Replace calls to " Alexander Duyck
2014-11-11 17:26 ` [net-next PATCH v3 4/5] fm10k/igb/ixgbe: Replace __skb_alloc_page with dev_alloc_page Alexander Duyck
2014-11-11 17:28 ` Jeff Kirsher
2014-11-11 17:48 ` David Miller
[not found] ` <20141111.124826.2036471212277751765.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2014-11-11 17:56 ` Jeff Kirsher
2014-11-11 17:57 ` David Miller
2014-11-11 17:27 ` Alexander Duyck [this message]
2014-11-12 5:11 ` [net-next PATCH v3 0/5] Replace __skb_alloc_pages with simpler function David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141111172705.16460.42660.stgit@ahduyck-vm-fedora20 \
--to=alexander.h.duyck@redhat.com \
--cc=balbi@ti.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@intel.com \
--cc=hariprasad@chelsio.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=leedom@chelsio.com \
--cc=linux-usb@vger.kernel.org \
--cc=matthew.vick@intel.com \
--cc=mgorman@suse.de \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox