net: macb: change GFP_ATOMIC to GFP_KERNEL

Now that the rx_fs_lock is no longer held across allocation, it's safe
to use GFP_KERNEL for allocating new entries.

This reverts commit 81da3bf6e3f88 ("net: macb: change GFP_KERNEL to
GFP_ATOMIC").

Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Julia Cartwright <julia@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 758e8b3042b2c13d8e43e87439523e655c9ee514..234667eaaa9230ec7fa933c578efab790d8fd3cc 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
        int ret = -EINVAL;
        bool added = false;
 
-       newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC);
+       newfs = kmalloc(sizeof(*newfs), GFP_KERNEL);
        if (newfs == NULL)
                return -ENOMEM;
        memcpy(&newfs->fs, fs, sizeof(newfs->fs));