|
@@ -369,7 +369,7 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
nc = this_cpu_ptr(&netdev_alloc_cache);
|
|
|
- data = __alloc_page_frag(nc, fragsz, gfp_mask);
|
|
|
+ data = page_frag_alloc(nc, fragsz, gfp_mask);
|
|
|
local_irq_restore(flags);
|
|
|
return data;
|
|
|
}
|
|
@@ -391,7 +391,7 @@ static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
|
|
|
{
|
|
|
struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
|
|
|
|
|
|
- return __alloc_page_frag(&nc->page, fragsz, gfp_mask);
|
|
|
+ return page_frag_alloc(&nc->page, fragsz, gfp_mask);
|
|
|
}
|
|
|
|
|
|
void *napi_alloc_frag(unsigned int fragsz)
|
|
@@ -441,7 +441,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
nc = this_cpu_ptr(&netdev_alloc_cache);
|
|
|
- data = __alloc_page_frag(nc, len, gfp_mask);
|
|
|
+ data = page_frag_alloc(nc, len, gfp_mask);
|
|
|
pfmemalloc = nc->pfmemalloc;
|
|
|
|
|
|
local_irq_restore(flags);
|
|
@@ -505,7 +505,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
|
|
|
if (sk_memalloc_socks())
|
|
|
gfp_mask |= __GFP_MEMALLOC;
|
|
|
|
|
|
- data = __alloc_page_frag(&nc->page, len, gfp_mask);
|
|
|
+ data = page_frag_alloc(&nc->page, len, gfp_mask);
|
|
|
if (unlikely(!data))
|
|
|
return NULL;
|
|
|
|