aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-09 18:51:07 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-09 18:52:21 +0200
commit62eae4805bc9d821a5d4ff590292b5a33563829b (patch)
tree662399085be4d5a76fe35b51e2d4639925455fbc /target/linux
parentc8a6ce71e49c108ca2225345f057777eb046e712 (diff)
downloadupstream-62eae4805bc9d821a5d4ff590292b5a33563829b.tar.gz
upstream-62eae4805bc9d821a5d4ff590292b5a33563829b.tar.bz2
upstream-62eae4805bc9d821a5d4ff590292b5a33563829b.zip
ar71xx: ag71xx: init rings with GFP_KERNEL
ar71xx got lost during final rebase .. Fixes: c8a6ce71e49c ("ar71xx/ath79: ag71xx: init rings with GFP_KERNEL") Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index 30ab37efe4..f0d8d46a18 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -291,7 +291,7 @@ static int ag71xx_rings_init(struct ag71xx *ag)
return -ENOMEM;
tx->descs_cpu = dma_alloc_coherent(NULL, ring_size * AG71XX_DESC_SIZE,
- &tx->descs_dma, GFP_ATOMIC);
+ &tx->descs_dma, GFP_KERNEL);
if (!tx->descs_cpu) {
kfree(tx->buf);
tx->buf = NULL;