mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
55922c9d1b
commit
e2cbc11c0e
2 changed files with 3 additions and 3 deletions
|
@ -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:
|
||||
|
|
|
@ -314,9 +314,6 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
|
|||
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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue