net: ethernet: et131x: Use GFP_KERNEL instead of GFP_ATOMIC when allocating tx_ring...
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Wed, 31 Jul 2019 07:38:42 +0000 (09:38 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 31 Jul 2019 15:33:30 +0000 (08:33 -0700)
There is no good reason to use GFP_ATOMIC here. Other memory allocations
are performed with GFP_KERNEL (see other 'dma_alloc_coherent()' below and
'kzalloc()' in 'et131x_rx_dma_memory_alloc()')

Use GFP_KERNEL which should be enough.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/agere/et131x.c

index ea34bcb..edbb4b3 100644 (file)
@@ -2362,7 +2362,7 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
 
        /* Allocate memory for the TCB's (Transmit Control Block) */
        tx_ring->tcb_ring = kcalloc(NUM_TCB, sizeof(struct tcb),
-                                   GFP_ATOMIC | GFP_DMA);
+                                   GFP_KERNEL | GFP_DMA);
        if (!tx_ring->tcb_ring)
                return -ENOMEM;