diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-08 12:11:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-08 12:11:21 -0700 |
| commit | df693f13a18f6eee0355741988f30c7c1e40ed9f (patch) | |
| tree | bbf0bd1b89cc3ad93ad39ac20d217da6ea6f2bc8 | |
| parent | 9bb392f62447d73cc7dd7562413a2cd9104c82f8 (diff) | |
| parent | 9f460ae31c4435fd022c443a6029352217a16ac1 (diff) | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 789f257be24f..fc8be49010b9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -409,8 +409,10 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) if (WARN_ON(!forw_packet->if_outgoing)) 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; + } if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) return; |