The following commit has been merged in the master branch: commit a9125b62d6181601afc36b49cce944f04555e398 Author: Sven Eckelmann sven@narfation.org Date: Fri Apr 1 08:49:18 2011 +0200

batman-adv: Add missing static for softif_neigh_deselect

053e6e6c30c161c218eacf2eb2eb4c7ecc0f387c forgot to mark the only locally used function softif_neigh_deselect as static.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/soft-interface.c b/soft-interface.c index 599b668..58ce440 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -123,7 +123,7 @@ static void softif_neigh_select(struct bat_priv *bat_priv, spin_unlock_bh(&bat_priv->softif_neigh_lock); }

-void softif_neigh_deselect(struct bat_priv *bat_priv) +static void softif_neigh_deselect(struct bat_priv *bat_priv) { softif_neigh_select(bat_priv, NULL); }