Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239dd4ee authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

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: 3f518509 ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20746d71

drivers/net/ethernet/marvell/mvpp2.c

+2 −2
Original line number Diff line number Diff line
@@ -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);