The following commit has been merged in the merge/master branch: commit 5019fc0faac0d8f0b377dbc7d27a3899c45237c3 Author: Sven Eckelmann sven@narfation.org Date: Wed Nov 18 09:41:41 2015 +0100

batman-adv: Fix variable declaration warning in batadv_compare_tt

checkpatch is warning about the wrong way a pointer is declared in batadv_compare_tt.

ERROR: "foo* bar" should be "foo *bar" #80: FILE: ./net/batman-adv/translation-table.c:80: + const struct batadv_tt_common_entry* tt1 = data1;

Fixes: af5fa950cbb6 ("batman-adv: fix erroneous client entry duplicate detection") Signed-off-by: Sven Eckelmann sven@narfation.org 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 77290cd..a7d9997 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -72,8 +72,8 @@ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry); - const struct batadv_tt_common_entry* tt1 = data1; - const struct batadv_tt_common_entry* tt2 = data2; + const struct batadv_tt_common_entry *tt1 = data1; + const struct batadv_tt_common_entry *tt2 = data2;

return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2); }