Commit 279e89b2 authored Aug 18, 2020 by Jussi Kivilinna Committed by Simon Wunderlich Aug 18, 2020

batman-adv: bla: use netif_rx_ni when not in interrupt context



batadv_bla_send_claim() gets called from worker thread context through
batadv_bla_periodic_work(), thus netif_rx_ni needs to be used in that
case. This fixes "NOHZ: local_softirq_pending 08" log messages seen
when batman-adv is enabled.

Fixes: 23721387 ("batman-adv: add basic bridge loop avoidance code")
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@haltian.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

parent d8bf0c01

net/batman-adv/bridge_loop_avoidance.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -437,7 +437,10 @@ 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);

		if (in_interrupt())
		netif_rx(skb);
		else
		netif_rx_ni(skb);
		out:
		if (primary_if)
		batadv_hardif_put(primary_if);

Admin message