diff options
| author | Antoine Tenart <antoine.tenart@free-electrons.com> | 2017-10-24 11:41:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-26 17:07:52 +0900 |
| commit | 239dd4ee4838523419ad16e05b16a2003b71d317 (patch) | |
| tree | 051eb2fec5dbe1754868f2d4587182b10ca54208 /drivers | |
| parent | 20746d717ea390ac6ac3aa531f27ac156bf2e747 (diff) | |
| download | linux-stable-239dd4ee4838523419ad16e05b16a2003b71d317.tar.gz linux-stable-239dd4ee4838523419ad16e05b16a2003b71d317.tar.bz2 linux-stable-239dd4ee4838523419ad16e05b16a2003b71d317.zip | |
net: mvpp2: do not sleep in set_rx_mode
This patch replaces GFP_KERNEL by GFP_ATOMIC to avoid sleeping in the
ndo_set_rx_mode() call which is called with BH disabled.
Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index c8ce652a4dd7..a37af5813f33 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -3396,7 +3396,7 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da, struct mvpp2_prs_entry *pe; int tid; - pe = kzalloc(sizeof(*pe), GFP_KERNEL); + pe = kzalloc(sizeof(*pe), GFP_ATOMIC); if (!pe) return NULL; mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); @@ -3458,7 +3458,7 @@ static int mvpp2_prs_mac_da_accept(struct mvpp2 *priv, int port, if (tid < 0) return tid; - pe = kzalloc(sizeof(*pe), GFP_KERNEL); + pe = kzalloc(sizeof(*pe), GFP_ATOMIC); if (!pe) return -ENOMEM; mvpp2_prs_tcam_lu_set(pe, MVPP2_PRS_LU_MAC); |