The following commit has been merged in the merge/master branch: commit a0f15fc75c8c8009d2130cf95098c7970656dfc1 Author: Sven Eckelmann sven@narfation.org Date: Sat Aug 8 02:37:01 2015 +0200

batman-adv: Mark batadv_iv_neigh_print as static

batadv_iv_neigh_print is not used outside of bat_iv_ogm.c and should thus be marked as static.

Fixes: 2e1133841c44 ("batman-adv: export single hop neighbor list via debugfs") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 5f76d22..5677169 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1895,7 +1895,8 @@ batadv_iv_hardif_neigh_print(struct seq_file *seq, * @bat_priv: the bat priv with all the soft interface information * @seq: neighbour table seq_file struct */ -void batadv_iv_neigh_print(struct batadv_priv *bat_priv, struct seq_file *seq) +static void batadv_iv_neigh_print(struct batadv_priv *bat_priv, + struct seq_file *seq) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_hardif_neigh_node *hardif_neigh;