diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-13 14:27:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-13 14:27:56 -0800 |
| commit | ebc71a3804350b3ed8d730e3d68515e2e183fd99 (patch) | |
| tree | e1e4a3ebbc62489aa46959bef24203e2cc813fad /net/batman-adv | |
| parent | 361f7e4a7501aad686128e8b1d18783667a4617a (diff) | |
| parent | b1de0f01b0115575982cf24c88b35106449e9aa7 (diff) | |
Merge tag 'batadv-next-pullrequest-20210312' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
There is only a single patch this time:
- Use netif_rx_any_context(), by Sebastian Andrzej Siewior
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 360bdbf44748..bcd543ce835b 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); |