diff options
| author | Sven Eckelmann <sven@narfation.org> | 2011-05-10 11:22:37 +0200 |
|---|---|---|
| committer | Sven Eckelmann <sven@narfation.org> | 2011-05-30 07:39:37 +0200 |
| commit | bb899b89f46eb1fd6f62a4c360f6511b9714e479 (patch) | |
| tree | abe2a2d492ef3bc9028d6deb2822abdd21b3c92f /net/batman-adv | |
| parent | 402196724816875d382099bedb09fdf1f57845bc (diff) | |
| download | kernel-common-bb899b89f46eb1fd6f62a4c360f6511b9714e479.tar.gz kernel-common-bb899b89f46eb1fd6f62a4c360f6511b9714e479.tar.bz2 kernel-common-bb899b89f46eb1fd6f62a4c360f6511b9714e479.zip | |
batman-adv: Ensure that we really have route changes in update_route
The debug output of update_route has tests for "route deleted" and "route
added". All other situations are handled as "route changed". This is not
true because neigh_node and curr_router could be both NULL.
The function is not called in this situation, but the code might be
interpreted wrong when reading it without this test.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/routing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 90ae6f0c30f3..368ceeba8145 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -108,7 +108,7 @@ static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, tt_buff, tt_buff_len); /* route changed */ - } else { + } else if (neigh_node && curr_router) { bat_dbg(DBG_ROUTES, bat_priv, "Changing route towards: %pM " "(now via %pM - was via %pM)\n", |