diff options
| author | Julia Lawall <julia.lawall@lip6.fr> | 2017-12-02 08:01:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-05 17:26:42 +0100 |
| commit | 81da3bf6e3f886267e450c422e6b7254ad6f93a5 (patch) | |
| tree | 0e181901d0cb3288ad7f17d3490c47fffe118c8a /drivers/net/ethernet/cadence | |
| parent | Merge branch 'SFP-phylink-updates' (diff) | |
| download | linux-81da3bf6e3f886267e450c422e6b7254ad6f93a5.tar.xz linux-81da3bf6e3f886267e450c422e6b7254ad6f93a5.zip | |
net: macb: change GFP_KERNEL to GFP_ATOMIC
Function gem_add_flow_filter called on line 2958 inside lock on line 2949
but uses GFP_KERNEL
Generated by: scripts/coccinelle/locks/call_kern.cocci
Fixes: ae8223de3df5 ("net: macb: Added support for RX filtering")
CC: Rafal Ozieblo <rafalo@cadence.com>
Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.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 c5fa87cdc6c4..8af325ef542d 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2799,7 +2799,7 @@ static int gem_add_flow_filter(struct net_device *netdev, int ret = -EINVAL; bool added = false; - newfs = kmalloc(sizeof(*newfs), GFP_KERNEL); + newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC); if (newfs == NULL) return -ENOMEM; memcpy(&newfs->fs, fs, sizeof(newfs->fs)); |