Commit e2cbc11c authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Sven Eckelmann
Browse files

batman-adv: move neigh_node->if_incoming->if_status check in find_router() 



Every time that find_router() is invoked, if_status has to be compared with
IF_ACTIVE. Moving this comparison inside find_router() will avoid to write it
each time.

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 55922c9d

net/batman-adv/routing.c

+3 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,9 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, 
		router = find_ifalter_router(primary_orig_node, recv_if);



return_router:

	if (router && router->if_incoming->if_status != IF_ACTIVE)

		goto err_unlock;



	rcu_read_unlock();

	return router;

err_unlock:

net/batman-adv/unicast.c

+0 −3
Original line number Diff line number Diff line
@@ -314,9 +314,6 @@ find_router: 
	if (!neigh_node)

		goto out;



	if (neigh_node->if_incoming->if_status != IF_ACTIVE)

		goto out;



	if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE