@@ -820,11 +820,13 @@ static void netcp_allocate_rx_buf(struct netcp_intf *netcp, int fdq)
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
if (primary_buf_len <= PAGE_SIZE) {
- bufptr = netdev_alloc_frag(primary_buf_len);
+ bufptr = __netdev_alloc_frag(primary_buf_len,
+ GFP_ATOMIC | __GFP_COLD |
+ __GFP_DMA);
pad[1] = primary_buf_len;
} else {
bufptr = kmalloc(primary_buf_len, GFP_ATOMIC |
- GFP_DMA32 | __GFP_COLD);
+ __GFP_COLD | __GFP_DMA);
pad[1] = 0;
}
@@ -838,9 +840,10 @@ static void netcp_allocate_rx_buf(struct netcp_intf *netcp, int fdq)
} else {
/* Allocate a secondary receive queue entry */
- page = alloc_page(GFP_ATOMIC | GFP_DMA32 | __GFP_COLD);
+ page = alloc_page(GFP_ATOMIC | __GFP_COLD | __GFP_DMA);
if (unlikely(!page)) {
- dev_warn_ratelimited(netcp->ndev_dev, "Secondary page alloc failed\n");
+ dev_warn_ratelimited(netcp->ndev_dev,
+ "Secondary page alloc failed\n");
goto fail;
}
buf_len = PAGE_SIZE;