Skip to content

Commit cc1674e

Browse files
Julia Cartwrightdavem330
authored andcommitted
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 81da3bf ("net: macb: change GFP_KERNEL to GFP_ATOMIC"). Cc: Julia Lawall <[email protected]> Signed-off-by: Julia Cartwright <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7038cdb commit cc1674e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
28002800
int ret = -EINVAL;
28012801
bool added = false;
28022802

2803-
newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC);
2803+
newfs = kmalloc(sizeof(*newfs), GFP_KERNEL);
28042804
if (newfs == NULL)
28052805
return -ENOMEM;
28062806
memcpy(&newfs->fs, fs, sizeof(newfs->fs));

0 commit comments

Comments
 (0)