Repository : ssh://git@diktynna/batman-adv
On branch : master
commit 9fc9079cdc159be4b89c385a34de2c70b6e9fb8d Author: Sebastian Andrzej Siewior bigeasy@linutronix.de Date: Sat Feb 13 18:02:04 2021 +0100
batman-adv: Use netif_rx_any_context().
The usage of in_interrupt() in non-core code is phased out. Ideally the information of the calling context should be passed by the callers or the functions be split as appropriate.
The attempt to consolidate the code by passing an arguemnt or by distangling it failed due lack of knowledge about this driver and because the call chains are hard to follow.
As a stop gap use netif_rx_any_context() which invokes the correct code path depending on context and confines the in_interrupt() usage to core code.
Signed-off-by: Sebastian Andrzej Siewior bigeasy@linutronix.de Signed-off-by: Sven Eckelmann sven@narfation.org
9fc9079cdc159be4b89c385a34de2c70b6e9fb8d compat-include/linux/netdevice.h | 13 +++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 5 +---- 2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index d6342f94..8f01b48f 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -54,4 +54,17 @@ static inline void batadv_netif_trans_update(struct net_device *dev)
#endif /* LINUX_VERSION_IS_LESS(4, 11, 9) */
+#if LINUX_VERSION_IS_LESS(5, 10, 0) + +#define netif_rx_any_context batadv_netif_rx_any_context +static inline int batadv_netif_rx_any_context(struct sk_buff *skb) +{ + if (in_interrupt()) + return netif_rx(skb); + else + return netif_rx_ni(skb); +} + +#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 360bdbf4..bcd543ce 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -438,10 +438,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);
- if (in_interrupt()) - netif_rx(skb); - else - netif_rx_ni(skb); + netif_rx_any_context(skb); out: if (primary_if) batadv_hardif_put(primary_if);