diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
| commit | a5e3c2aae23a3719105c1ae662c67ef282f213db (patch) | |
| tree | f951e78782757dfc2d4b7015601f65101ac2ef73 /net/batman-adv/originator.c | |
| parent | 6b28ff3be829a851378551245fd6b3f9bf93b0ad (diff) | |
| parent | 091b948306d2628320e77977eb7ae4a757b12180 (diff) | |
| download | blackbird-op-linux-a5e3c2aae23a3719105c1ae662c67ef282f213db.tar.gz blackbird-op-linux-a5e3c2aae23a3719105c1ae662c67ef282f213db.zip | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 6b7fb6b7e6f9..54863c9385de 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -247,7 +247,7 @@ static bool purge_orig_node(struct bat_priv *bat_priv, orig_node->hna_buff_len); /* update bonding candidates, we could have lost * some candidates. */ - update_bonding_candidates(bat_priv, orig_node); + update_bonding_candidates(orig_node); } } |
