Skip to content

Commit 279e89b

Browse files
Jussi Kivilinnasimonwunderlich
authored andcommitted
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: 2372138 ("batman-adv: add basic bridge loop avoidance code") Signed-off-by: Jussi Kivilinna <[email protected]> Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]>
1 parent d8bf0c0 commit 279e89b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/batman-adv/bridge_loop_avoidance.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,10 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
437437
batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
438438
skb->len + ETH_HLEN);
439439

440-
netif_rx(skb);
440+
if (in_interrupt())
441+
netif_rx(skb);
442+
else
443+
netif_rx_ni(skb);
441444
out:
442445
if (primary_if)
443446
batadv_hardif_put(primary_if);

0 commit comments

Comments
 (0)