Commit df693f13 authored by David S. Miller's avatar David S. Miller

Merge tag 'batadv-net-pullrequest-20210608' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here is a batman-adv bugfix:

 - Avoid WARN_ON timing related checks, by Sven Eckelmann
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9bb392f6 9f460ae3
...@@ -409,8 +409,10 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) ...@@ -409,8 +409,10 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
if (WARN_ON(!forw_packet->if_outgoing)) if (WARN_ON(!forw_packet->if_outgoing))
return; return;
if (WARN_ON(forw_packet->if_outgoing->soft_iface != soft_iface)) if (forw_packet->if_outgoing->soft_iface != soft_iface) {
pr_warn("%s: soft interface switch for queued OGM\n", __func__);
return; return;
}
if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment