summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/skbuff.h7
-rw-r--r--net/core/skbuff.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7be5bb4c94b6..59c9fd55699d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -5050,12 +5050,5 @@ static inline void skb_mark_for_recycle(struct sk_buff *skb)
}
#endif
-static inline bool skb_pp_recycle(struct sk_buff *skb, void *data)
-{
- if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb->pp_recycle)
- return false;
- return page_pool_return_skb_page(virt_to_page(data));
-}
-
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1d9719e72f9d..9b3b19816d2d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -748,6 +748,13 @@ static void skb_clone_fraglist(struct sk_buff *skb)
skb_get(list);
}
+static bool skb_pp_recycle(struct sk_buff *skb, void *data)
+{
+ if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb->pp_recycle)
+ return false;
+ return page_pool_return_skb_page(virt_to_page(data));
+}
+
static void skb_free_head(struct sk_buff *skb)
{
unsigned char *head = skb->head;
> 2014-03-24uml/net_kern: Call dev_consume_skb_any instead of dev_kfree_skb.Eric W. Biederman 2014-03-20audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALLAKASHI Takahiro 2014-02-09locking/mcs: Allow architecture specific asm files to be used for contended caseTim Chen 2014-02-09locking/mcs: Order the header files in Kbuild of each architecture in alphabe...Tim Chen 2014-01-26Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlLinus Torvalds 2014-01-26um: Include generic barrier.hRichard Weinberger 2014-01-26um: Removed unused attributes from thread_structRichard Weinberger 2014-01-25Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds 2014-01-23um: use generic fixmap.hMark Salter 2013-12-17lib: Add missing arch generic-y entries for asm-generic/hash.hDavid S. Miller 2013-12-01um: Build always with -mcmodel=large on 64bitRichard Weinberger 2013-12-01um: Rename print_stack_trace to do_stack_traceRichard Weinberger 2013-11-19Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlLinus Torvalds 2013-11-19Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds 2013-11-17um: Remove unused declarations from <as-layout.h>Geert Uytterhoeven 2013-11-17um: remove used STDIO_CONSOLE Kconfig paramMichael Opdenacker 2013-11-17arch/um: make it work with defconfig and x86_64Ramkumar Ramachandra 2013-11-17um: Make kstack_depth_to_print conform to arch/x86Richard Weinberger 2013-11-17um: Get rid of thread_struct->saved_taskRichard Weinberger 2013-11-17um: Make stack trace reliable against kernel mode faultsRichard Weinberger 2013-11-17um: Rewrite show_stack()Richard Weinberger 2013-11-15um: handle pgtable_page_ctor() fail