diff options
| author |   Julia Cartwright <julia@ni.com> | 2017-12-05 18:02:50 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-12-05 20:08:03 -0500 |
| commit | cc1674eeee60ad158d16129837bd91f93a2f7b26 (patch) | |
| tree | 91f74e51339a36da5305ac9d82bc04061a1495e0 /drivers/net/ethernet/cadence | |
| parent | net: macb: reduce scope of rx_fs_lock-protected regions (diff) | |
| download | linux-dev-cc1674eeee60ad158d16129837bd91f93a2f7b26.tar.xz linux-dev-cc1674eeee60ad158d16129837bd91f93a2f7b26.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 758e8b3042b2..234667eaaa92 100644 --- 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)); |