The following commit has been merged in the merge/master branch: commit 2ceab95956f05020e9c440f5fd33a45e5ff30126 Author: Sven Eckelmann sven.eckelmann@open-mesh.com Date: Thu May 5 12:35:18 2016 +0200

batman-adv: Remove unused work_struct forward declaration

The only function declaration using the "struct work_struct" was removed and thus this forward declaration should also be removed.

Fixes: 0d8468553c3c ("batman-adv: remove ogm_emit and ogm_schedule API calls") Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index f6fda19..7cecb75 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -26,7 +26,6 @@ #include "packet.h"

struct sk_buff; -struct work_struct;

void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); int batadv_send_skb_to_orig(struct sk_buff *skb,