| Message ID | da389d51c2f4d8a600418143e00be40423255576.1512518311.git.julia@ni.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | macb rx filter cleanups | expand |
On Tue, 5 Dec 2017, Julia Cartwright wrote: > 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> Acked-by: Julia Lawall <julia.lawall@lip6.fr> > --- > drivers/net/ethernet/cadence/macb_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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)); > -- > 2.14.2 > >
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));
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> --- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)