The following commit has been merged in the batadv/lts/5.15 branch: commit e65d78b12fbc0f4392f9d97dda11e2157a36de42 Author: Sebastian Andrzej Siewior bigeasy@linutronix.de Date: Sun Mar 6 22:57:48 2022 +0100

batman-adv: Use netif_rx().

[ Upstream commit 94da81e2fc4285db373fe9a1eb012c2ee205b110 ]

Since commit baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")

the function netif_rx() can be used in preemptible/thread context as well as in interrupt context.

Use netif_rx().

Cc: Antonio Quartulli a@unstable.cc Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Signed-off-by: Sebastian Andrzej Siewior bigeasy@linutronix.de Acked-by: Sven Eckelmann sven@narfation.org Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Sasha Levin sashal@kernel.org

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 17687848daec..11f6ef657d82 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -443,7 +443,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, skb->len + ETH_HLEN);

- netif_rx_any_context(skb); + netif_rx(skb); out: batadv_hardif_put(primary_if); }