The following commit has been merged in the merge/master branch: commit 48e180150b7c49dcf440c954e4d0c93a1054d966 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu Jun 18 16:24:24 2015 +0800

batman-adv: rename batadv_new_tt_req_node to batadv_tt_req_node_new

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 26d8e00..8ef27bb 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2268,11 +2268,16 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv) spin_unlock_bh(&bat_priv->tt.req_list_lock); }

-/* returns the pointer to the new tt_req_node struct if no request - * has already been issued for this orig_node, NULL otherwise +/** + * batadv_tt_req_node_new - search and possibly create a tt_req_node object + * @bat_priv: the bat priv with all the soft interface information + * @orig_node: orig node this request is being issued for + * + * Returns the pointer to the new tt_req_node struct if no request + * has already been issued for this orig_node, NULL otherwise. */ static struct batadv_tt_req_node * -batadv_new_tt_req_node(struct batadv_priv *bat_priv, +batadv_tt_req_node_new(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node) { struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node = NULL; @@ -2501,7 +2506,7 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, /* The new tt_req will be issued only if I'm not waiting for a * reply from the same orig_node yet */ - tt_req_node = batadv_new_tt_req_node(bat_priv, dst_orig_node); + tt_req_node = batadv_tt_req_node_new(bat_priv, dst_orig_node); if (!tt_req_node) goto out;