The following commit has been merged in the master branch: commit 6b9aadfa97efa5a73c005c5c4c667359a0c85bec Author: Sven Eckelmann sven@narfation.org Date: Sat Jun 4 12:40:37 2011 +0200

batman-adv: Don't return value in void function

gw_node_delete is defined with "void" as return type, but still tries to return a value. The called function gw_node_delete is also return as void and thus doesn't provide a value for us.

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

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index ab597c4..cf7f95e 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -352,7 +352,7 @@ unlock:

void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node) { - return gw_node_update(bat_priv, orig_node, 0); + gw_node_update(bat_priv, orig_node, 0); }

void gw_node_purge(struct bat_priv *bat_priv)