Skip to content

Commit

Permalink
net: macb: change GFP_ATOMIC to GFP_KERNEL
Browse files Browse the repository at this point in the history
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 81da3bf ("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>
  • Loading branch information
Julia Cartwright authored and David S. Miller committed Dec 6, 2017
1 parent 7038cdb commit cc1674e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cadence/macb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit cc1674e

Please sign in to comment.