Commit cc1674ee authored by Julia Cartwright's avatar Julia Cartwright Committed by David S. Miller

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 81da3bf6 ("net: macb: change GFP_KERNEL to
GFP_ATOMIC").

Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarJulia Cartwright <julia@ni.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7038cdb7
...@@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev, ...@@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
int ret = -EINVAL; int ret = -EINVAL;
bool added = false; bool added = false;
newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC); newfs = kmalloc(sizeof(*newfs), GFP_KERNEL);
if (newfs == NULL) if (newfs == NULL)
return -ENOMEM; return -ENOMEM;
memcpy(&newfs->fs, fs, sizeof(newfs->fs)); memcpy(&newfs->fs, fs, sizeof(newfs->fs));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment