OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

batman-adv: adapt bonding to use the new API functions 

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
This commit is contained in:
Antonio Quartulli 2013-09-02 12:15:06 +02:00 committed by Antonio Quartulli
parent c43c981e50
commit 6680a1249f
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/batman-adv/bat_iv_ogm.c
View File

@ -853,7 +853,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
neigh_node->last_ttl = batadv_ogm_packet->header.ttl; neigh_node->last_ttl = batadv_ogm_packet->header.ttl;
} }
batadv_bonding_candidate_add(orig_node, neigh_node); batadv_bonding_candidate_add(bat_priv, orig_node, neigh_node);
/* if this neighbor already is our next hop there is nothing /* if this neighbor already is our next hop there is nothing
* to change * to change

42
net/batman-adv/routing.c
View File

@ -115,11 +115,21 @@ out:
return; return;
} }
void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node, /**
* batadv_bonding_candidate_add - consider a new link for bonding mode towards
* the given originator
* @bat_priv: the bat priv with all the soft interface information
* @orig_node: the target node
* @neigh_node: the neighbor representing the new link to consider for bonding
* mode
*/
void batadv_bonding_candidate_add(struct batadv_priv *bat_priv,
struct batadv_orig_node *orig_node,
struct batadv_neigh_node *neigh_node) struct batadv_neigh_node *neigh_node)
{ {
struct batadv_algo_ops *bao = bat_priv->bat_algo_ops;
struct batadv_neigh_node *tmp_neigh_node, *router = NULL; struct batadv_neigh_node *tmp_neigh_node, *router = NULL;
uint8_t interference_candidate = 0, tq; uint8_t interference_candidate = 0;
spin_lock_bh(&orig_node->neigh_list_lock); spin_lock_bh(&orig_node->neigh_list_lock);
@ -134,8 +144,7 @@ void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node,
/* ... and is good enough to be considered */ /* ... and is good enough to be considered */
tq = router->bat_iv.tq_avg - BATADV_BONDING_TQ_THRESHOLD; if (bao->bat_neigh_is_equiv_or_better(neigh_node, router))
if (neigh_node->bat_iv.tq_avg < tq)
goto candidate_del; goto candidate_del;
/* check if we have another candidate with the same mac address or /* check if we have another candidate with the same mac address or
@ -481,18 +490,25 @@ out:
return router; return router;
} }
/* Interface Alternating: Use the best of the /**
* remaining candidates which are not using * batadv_find_ifalter_router - find the best of the remaining candidates which
* this interface. * are not using this interface
* @bat_priv: the bat priv with all the soft interface information
* @primary_orig: the destination
* @recv_if: the interface that the router returned by this function has to not
* use
* *
* Increases the returned router's refcount * Returns the best candidate towards primary_orig that is not using recv_if.
* Increases the returned neighbor's refcount
*/ */
static struct batadv_neigh_node * static struct batadv_neigh_node *
batadv_find_ifalter_router(struct batadv_orig_node *primary_orig, batadv_find_ifalter_router(struct batadv_priv *bat_priv,
struct batadv_orig_node *primary_orig,
const struct batadv_hard_iface *recv_if) const struct batadv_hard_iface *recv_if)
{ {
struct batadv_neigh_node *tmp_neigh_node;
struct batadv_neigh_node *router = NULL, *first_candidate = NULL; struct batadv_neigh_node *router = NULL, *first_candidate = NULL;
struct batadv_algo_ops *bao = bat_priv->bat_algo_ops;
struct batadv_neigh_node *tmp_neigh_node;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(tmp_neigh_node, &primary_orig->bond_list, list_for_each_entry_rcu(tmp_neigh_node, &primary_orig->bond_list,
@ -504,8 +520,7 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
if (tmp_neigh_node->if_incoming == recv_if) if (tmp_neigh_node->if_incoming == recv_if)
continue; continue;
if (router && if (router && bao->bat_neigh_cmp(tmp_neigh_node, router))
tmp_neigh_node->bat_iv.tq_avg <= router->bat_iv.tq_avg)
continue; continue;
if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))
@ -639,7 +654,8 @@ batadv_find_router(struct batadv_priv *bat_priv,
if (bonding_enabled) if (bonding_enabled)
router = batadv_find_bond_router(primary_orig_node, recv_if); router = batadv_find_bond_router(primary_orig_node, recv_if);
else else
router = batadv_find_ifalter_router(primary_orig_node, recv_if); router = batadv_find_ifalter_router(bat_priv, primary_orig_node,
recv_if);
return_router: return_router:
if (router && router->if_incoming->if_status != BATADV_IF_ACTIVE) if (router && router->if_incoming->if_status != BATADV_IF_ACTIVE)

3
net/batman-adv/routing.h
View File

@ -48,7 +48,8 @@ batadv_find_router(struct batadv_priv *bat_priv,
const struct batadv_hard_iface *recv_if); const struct batadv_hard_iface *recv_if);
void batadv_bonding_candidate_del(struct batadv_orig_node *orig_node, void batadv_bonding_candidate_del(struct batadv_orig_node *orig_node,
struct batadv_neigh_node *neigh_node); struct batadv_neigh_node *neigh_node);
void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node, void batadv_bonding_candidate_add(struct batadv_priv *bat_priv,
struct batadv_orig_node *orig_node,
struct batadv_neigh_node *neigh_node); struct batadv_neigh_node *neigh_node);
void batadv_bonding_save_primary(const struct batadv_orig_node *orig_node, void batadv_bonding_save_primary(const struct batadv_orig_node *orig_node,
struct batadv_orig_node *orig_neigh_node, struct batadv_orig_node *orig_neigh_node,