diff options
| author | Simon Wunderlich <simon@open-mesh.com> | 2013-11-13 22:14:45 +0400 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2014-01-12 17:41:10 +0400 |
| commit | f6c8b71173ad50e48e6569a1ef5d7d4486268b4d (patch) | |
| tree | ece15dadcb5973de5eb11c0f4f2b9031d90462f4 /net/batman-adv/bat_iv_ogm.c | |
| parent | f9577a376e28d7b8367319e103d6511d41c1c5fa (diff) | |
| download | linux-f6c8b71173ad50e48e6569a1ef5d7d4486268b4d.tar.xz | |
batman-adv: remove bonding and interface alternating
Remove bonding and interface alternating code - it will be replaced
by a new, network-wide multi interface optimization which enables
both bonding and interface alternating in a better way.
Keep the sysfs and find router function though, this will be needed
later.
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 278d78bd7735..48f5d3537ee3 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -974,8 +974,6 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, neigh_node->last_ttl = batadv_ogm_packet->ttl; } - batadv_bonding_candidate_add(bat_priv, orig_node, neigh_node); - /* if this neighbor already is our next hop there is nothing * to change */ @@ -1424,9 +1422,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, is_bidirect = batadv_iv_ogm_calc_tq(orig_node, orig_neigh_node, batadv_ogm_packet, if_incoming); - batadv_bonding_save_primary(orig_node, orig_neigh_node, - batadv_ogm_packet); - /* update ranking if it is not a duplicate or has the same * seqno and similar ttl as the non-duplicate */ |