Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/cadence/macb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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));