The following commit has been merged in the merge/master branch: commit 5b0b10ea4b6adb532b9b21f6b90454574b3a9e6a Author: Sven Eckelmann sven@narfation.org Date: Sun Nov 22 00:59:30 2015 +0100

batman-adv: Add missing forward declaration for net_device

A new function batadv_bla_status_update was introduced which uses the not yet defined struct net_device as parameter. Add the forward declaration to avoid compiler warnings about type declarations inside parameter list.

Fixes: 07ed3c31d795 ("batman-adv: purge bridge loop avoidance when its disabled") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index db1aeb5..7ea199b 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -22,6 +22,7 @@

#include <linux/types.h>

+struct net_device; struct seq_file; struct sk_buff;