On Sunday, 7 June 2026 13:54:01 CEST Sven Eckelmann wrote: > With the immutability guarantee of batadv_hard_iface->mesh_iface, the check > for "changed" (or NULL) mesh_iface is no longer necessary because and > batadv_hard_iface can no longer migrate from one batadv_mesh_iface to > another one. > > Signed-off-by: Sven Eckelmann <[email protected]> > --- > net/batman-adv/bat_iv_ogm.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c > index d9e4d023..89803a8a 100644 > --- a/net/batman-adv/bat_iv_ogm.c > +++ b/net/batman-adv/bat_iv_ogm.c > @@ -407,11 +407,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet > *forw_packet) > if (WARN_ON(!forw_packet->if_outgoing)) > return; > > - if (forw_packet->if_outgoing->mesh_iface != mesh_iface) { > - pr_warn("%s: mesh interface switch for queued OGM\n", __func__); > - return; > - } > - > if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) > return; > > >
This should be added with the next revision:
diff --git i/net/batman-adv/bat_iv_ogm.c w/net/batman-adv/bat_iv_ogm.c
index 89803a8a..43440ccd 100644
--- i/net/batman-adv/bat_iv_ogm.c
+++ w/net/batman-adv/bat_iv_ogm.c
@@ -395,15 +395,11 @@ static void batadv_iv_ogm_send_to_if(struct
batadv_forw_packet *forw_packet,
/* send a batman ogm packet */
static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
{
- struct net_device *mesh_iface;
-
if (!forw_packet->if_incoming) {
pr_err("Error - can't forward packet: incoming iface not
specified\n");
return;
}
- mesh_iface = forw_packet->if_incoming->mesh_iface;
-
if (WARN_ON(!forw_packet->if_outgoing))
return;
signature.asc
Description: This is a digitally signed message part.
