diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2019-07-31 09:38:42 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-31 08:33:30 -0700 |
| commit | 47b69bf74f16b20a3bb95b1fe27e5347dd34b683 (patch) | |
| tree | 7652180bb40f521bd6976565ff07bcb5f96a866d /drivers/net/ethernet/agere | |
| parent | drop_monitor: Add missing uAPI file to MAINTAINERS file (diff) | |
| download | linux-dev-47b69bf74f16b20a3bb95b1fe27e5347dd34b683.tar.xz linux-dev-47b69bf74f16b20a3bb95b1fe27e5347dd34b683.zip | |
net: ethernet: et131x: Use GFP_KERNEL instead of GFP_ATOMIC when allocating tx_ring->tcb_ring
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>
Diffstat (limited to 'drivers/net/ethernet/agere')
| -rw-r--r-- | drivers/net/ethernet/agere/et131x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c index ea34bcb868b5..edbb4b3604c7 100644 --- a/drivers/net/ethernet/agere/et131x.c +++ b/drivers/net/ethernet/agere/et131x.c @@ -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; |