Skip to content

Commit 57618e1

Browse files
committed
Reapply "cnic: don't pass bogus GFP_ flags to dma_alloc_coherent"
JIRA: https://issues.redhat.com/browse/RHEL-26081 Upstream Status: RHEL Only This reverts commit cde86c6. Signed-off-by: Chris Leech <cleech@redhat.com>
1 parent 665af06 commit 57618e1

File tree

1 file changed

+2
-4
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+2
-4
lines changed

drivers/net/ethernet/broadcom/cnic.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,16 +1027,14 @@ static int __cnic_alloc_uio_rings(struct cnic_uio_dev *udev, int pages)
10271027

10281028
udev->l2_ring_size = pages * CNIC_PAGE_SIZE;
10291029
udev->l2_ring = dma_alloc_coherent(&udev->pdev->dev, udev->l2_ring_size,
1030-
&udev->l2_ring_map,
1031-
GFP_KERNEL | __GFP_COMP);
1030+
&udev->l2_ring_map, GFP_KERNEL);
10321031
if (!udev->l2_ring)
10331032
return -ENOMEM;
10341033

10351034
udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size;
10361035
udev->l2_buf_size = CNIC_PAGE_ALIGN(udev->l2_buf_size);
10371036
udev->l2_buf = dma_alloc_coherent(&udev->pdev->dev, udev->l2_buf_size,
1038-
&udev->l2_buf_map,
1039-
GFP_KERNEL | __GFP_COMP);
1037+
&udev->l2_buf_map, GFP_KERNEL);
10401038
if (!udev->l2_buf) {
10411039
__cnic_free_uio_rings(udev);
10421040
return -ENOMEM;

0 commit comments

Comments
 (0)