Merge tag 'batadv-next-for-davem-20170613' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - decrease maximum fragment size, by Matthias Schiffer - Clean up seqfile writing, by Markus Elfring (2 patches) - use __func__ in debug messages, by Sven Eckelmann - Mark tpmeter initializers with __init, by Antonio Quartulli - ignore loop detection MAC addresses, by Simon Wunderlich - clean up some return handling, by Simon Wunderlich - improve ELP throughput value handling for WiFi neighbors in BATMAN V/ELP, by Sven Eckelmann (2 patches) ====================

David S. Miller committed 9 years ago

Commit 5952b022 parents 5514174 d62890811 files · +72 −62Browse files

Unified · Split

11 files

net/batman-adv/bat_iv_ogm.c +3 −2
net/batman-adv/bat_v.c +1 −1
net/batman-adv/bat_v_elp.c +8 −2
net/batman-adv/bridge_loop_avoidance.c +38 −35
net/batman-adv/distributed-arp-table.c +1 −1
net/batman-adv/main.h +2 −2
net/batman-adv/network-coding.c +1 −3
net/batman-adv/routing.c +2 −2
net/batman-adv/send.c +3 −3
net/batman-adv/tp_meter.c +2 −1
net/batman-adv/translation-table.c +11 −10

net/batman-adv/bat_iv_ogm.c+3−2

@@ -1022,7 +1022,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, · 1021 unmodified lines
1022	1022	u8 tq_avg;
1023	1023
1024	1024	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
1025		− "update_originator(): Searching and updating originator entry of received packet\n");
	1025	+ "%s(): Searching and updating originator entry of received packet\n",
	1026	+ __func__);
1026	1027
1027	1028	rcu_read_lock();
1028	1029	hlist_for_each_entry_rcu(tmp_neigh_node,
@@ -1944,7 +1945,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, · 915 unmodified lines
1944	1945
1945	1946	batadv_iv_ogm_orig_print_neigh(orig_node, if_outgoing,
1946	1947	seq);
1947		− seq_puts(seq, "\n");
	1948	+ seq_putc(seq, '\n');
1948	1949	batman_count++;
1949	1950
1950	1951	next:

net/batman-adv/bat_v.c+1−1

@@ -400,7 +400,7 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, · 399 unmodified lines
400	400	neigh_node->if_incoming->net_dev->name);
401	401
402	402	batadv_v_orig_print_neigh(orig_node, if_outgoing, seq);
403		− seq_puts(seq, "\n");
	403	+ seq_putc(seq, '\n');
404	404	batman_count++;
405	405
406	406	next:

net/batman-adv/bat_v_elp.c+8−2

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	19	#include "main.h"
20	20
21	21	#include <linux/atomic.h>
	22	+#include <linux/bitops.h>
22	23	#include <linux/byteorder/generic.h>
23	24	#include <linux/errno.h>
24	25	#include <linux/etherdevice.h>
@@ -29,6 +30,7 @@ · 4 unmodified lines
29	30	#include <linux/kernel.h>
30	31	#include <linux/kref.h>
31	32	#include <linux/netdevice.h>
	33	+#include <linux/nl80211.h>
32	34	#include <linux/random.h>
33	35	#include <linux/rculist.h>
34	36	#include <linux/rcupdate.h>
@@ -109,8 +111,12 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) · 74 unmodified lines
109	111	*/
110	112	return 0;
111	113	}
112		− if (!ret)
113		− return sinfo.expected_throughput / 100;
	114	+ if (ret)
	115	+ goto default_throughput;
	116	+ if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)))
	117	+ goto default_throughput;
	118	+
	119	+ return sinfo.expected_throughput / 100;
114	120	}
115	121
116	122	/* if not a wifi interface, check if this device provides data via

net/batman-adv/bridge_loop_avoidance.c+38−35

@@ -394,7 +394,7 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac, · 393 unmodified lines
394	394	*/
395	395	ether_addr_copy(ethhdr->h_source, mac);
396	396	batadv_dbg(BATADV_DBG_BLA, bat_priv,
397		− "bla_send_claim(): CLAIM %pM on vid %d\n", mac,
	397	+ "%s(): CLAIM %pM on vid %d\n", __func__, mac,
398	398	batadv_print_vid(vid));
399	399	break;
400	400	case BATADV_CLAIM_TYPE_UNCLAIM:
@@ -403,7 +403,7 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac, · 2 unmodified lines
403	403	*/
404	404	ether_addr_copy(hw_src, mac);
405	405	batadv_dbg(BATADV_DBG_BLA, bat_priv,
406		− "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,
	406	+ "%s(): UNCLAIM %pM on vid %d\n", __func__, mac,
407	407	batadv_print_vid(vid));
408	408	break;
409	409	case BATADV_CLAIM_TYPE_ANNOUNCE:
@@ -412,7 +412,7 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac, · 2 unmodified lines
412	412	*/
413	413	ether_addr_copy(hw_src, mac);
414	414	batadv_dbg(BATADV_DBG_BLA, bat_priv,
415		− "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
	415	+ "%s(): ANNOUNCE of %pM on vid %d\n", __func__,
416	416	ethhdr->h_source, batadv_print_vid(vid));
417	417	break;
418	418	case BATADV_CLAIM_TYPE_REQUEST:
@@ -423,15 +423,15 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac, · 4 unmodified lines
423	423	ether_addr_copy(hw_src, mac);
424	424	ether_addr_copy(ethhdr->h_dest, mac);
425	425	batadv_dbg(BATADV_DBG_BLA, bat_priv,
426		− "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n",
	426	+ "%s(): REQUEST of %pM to %pM on vid %d\n", __func__,
427	427	ethhdr->h_source, ethhdr->h_dest,
428	428	batadv_print_vid(vid));
429	429	break;
430	430	case BATADV_CLAIM_TYPE_LOOPDETECT:
431	431	ether_addr_copy(ethhdr->h_source, mac);
432	432	batadv_dbg(BATADV_DBG_BLA, bat_priv,
433		− "bla_send_claim(): LOOPDETECT of %pM to %pM on vid %d\n",
434		− ethhdr->h_source, ethhdr->h_dest,
	433	+ "%s(): LOOPDETECT of %pM to %pM on vid %d\n",
	434	+ __func__, ethhdr->h_source, ethhdr->h_dest,
435	435	batadv_print_vid(vid));
436	436
437	437	break;
@@ -509,7 +509,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv bat_priv, u8 orig, · 71 unmodified lines
509	509	return entry;
510	510
511	511	batadv_dbg(BATADV_DBG_BLA, bat_priv,
512		− "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
	512	+ "%s(): not found (%pM, %d), creating new entry\n", __func__,
513	513	orig, batadv_print_vid(vid));
514	514
515	515	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
@@ -605,7 +605,8 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, · 89 unmodified lines
605	605	int i;
606	606
607	607	batadv_dbg(BATADV_DBG_BLA, bat_priv,
608		− "bla_answer_request(): received a claim request, send all of our own claims again\n");
	608	+ "%s(): received a claim request, send all of our own claims again\n",
	609	+ __func__);
609	610
610	611	backbone_gw = batadv_backbone_hash_find(bat_priv,
611	612	primary_if->net_dev->dev_addr,
@@ -718,8 +719,8 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, · 106 unmodified lines
718	719	kref_init(&claim->refcount);
719	720
720	721	batadv_dbg(BATADV_DBG_BLA, bat_priv,
721		− "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
722		− mac, batadv_print_vid(vid));
	722	+ "%s(): adding new entry %pM, vid %d to hash ...\n",
	723	+ __func__, mac, batadv_print_vid(vid));
723	724
724	725	kref_get(&claim->refcount);
725	726	hash_added = batadv_hash_add(bat_priv->bla.claim_hash,
@@ -739,8 +740,9 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, · 13 unmodified lines
739	740	goto claim_free_ref;
740	741
741	742	batadv_dbg(BATADV_DBG_BLA, bat_priv,
742		− "bla_add_claim(): changing ownership for %pM, vid %d to gw %pM\n",
743		− mac, batadv_print_vid(vid), backbone_gw->orig);
	743	+ "%s(): changing ownership for %pM, vid %d to gw %pM\n",
	744	+ __func__, mac, batadv_print_vid(vid),
	745	+ backbone_gw->orig);
744	746
745	747	remove_crc = true;
746	748	}
@@ -808,7 +810,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, · 61 unmodified lines
808	810	if (!claim)
809	811	return;
810	812
811		− batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
	813	+ batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__,
812	814	mac, batadv_print_vid(vid));
813	815
814	816	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
@@ -848,8 +850,8 @@ static bool batadv_handle_announce(struct batadv_priv bat_priv, u8 an_addr, · 33 unmodified lines
848	850	crc = ntohs(((__be16 )(&an_addr[4])));
849	851
850	852	batadv_dbg(BATADV_DBG_BLA, bat_priv,
851		− "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",
852		− batadv_print_vid(vid), backbone_gw->orig, crc);
	853	+ "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",
	854	+ __func__, batadv_print_vid(vid), backbone_gw->orig, crc);
853	855
854	856	spin_lock_bh(&backbone_gw->crc_lock);
855	857	backbone_crc = backbone_gw->crc;
@@ -857,8 +859,8 @@ static bool batadv_handle_announce(struct batadv_priv bat_priv, u8 an_addr, · 1 unmodified line
857	859
858	860	if (backbone_crc != crc) {
859	861	batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
860		− "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",
861		− backbone_gw->orig,
	862	+ "%s(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",
	863	+ __func__, backbone_gw->orig,
862	864	batadv_print_vid(backbone_gw->vid),
863	865	backbone_crc, crc);
864	866
@@ -903,8 +905,8 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv, · 38 unmodified lines
903	905	return true;
904	906
905	907	batadv_dbg(BATADV_DBG_BLA, bat_priv,
906		− "handle_request(): REQUEST vid %d (sent by %pM)...\n",
907		− batadv_print_vid(vid), ethhdr->h_source);
	908	+ "%s(): REQUEST vid %d (sent by %pM)...\n",
	909	+ __func__, batadv_print_vid(vid), ethhdr->h_source);
908	910
909	911	batadv_bla_answer_request(bat_priv, primary_if, vid);
910	912	return true;
@@ -940,7 +942,7 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv, · 29 unmodified lines
940	942
941	943	/* this must be an UNCLAIM frame */
942	944	batadv_dbg(BATADV_DBG_BLA, bat_priv,
943		− "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
	945	+ "%s(): UNCLAIM %pM on vid %d (sent by %pM)...\n", __func__,
944	946	claim_addr, batadv_print_vid(vid), backbone_gw->orig);
945	947
946	948	batadv_bla_del_claim(bat_priv, claim_addr, vid);
@@ -1160,9 +1162,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, · 213 unmodified lines
1160	1162	ethhdr);
1161	1163	if (ret == 1)
1162	1164	batadv_dbg(BATADV_DBG_BLA, bat_priv,
1163		− "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
1164		− ethhdr->h_source, batadv_print_vid(vid), hw_src,
1165		− hw_dst);
	1165	+ "%s(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
	1166	+ __func__, ethhdr->h_source, batadv_print_vid(vid),
	1167	+ hw_src, hw_dst);
1166	1168
1167	1169	if (ret < 2)
1168	1170	return !!ret;
@@ -1196,8 +1198,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, · 27 unmodified lines
1196	1198	}
1197	1199
1198	1200	batadv_dbg(BATADV_DBG_BLA, bat_priv,
1199		− "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
1200		− ethhdr->h_source, batadv_print_vid(vid), hw_src, hw_dst);
	1201	+ "%s(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
	1202	+ __func__, ethhdr->h_source, batadv_print_vid(vid), hw_src,
	1203	+ hw_dst);
1201	1204	return true;
1202	1205	}
1203	1206
@@ -1237,8 +1240,8 @@ static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now) · 33 unmodified lines
1237	1240	continue;
1238	1241
1239	1242	batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
1240		− "bla_purge_backbone_gw(): backbone gw %pM timed out\n",
1241		− backbone_gw->orig);
	1243	+ "%s(): backbone gw %pM timed out\n",
	1244	+ __func__, backbone_gw->orig);
1242	1245
1243	1246	purge_now:
1244	1247	/* don't wait for the pending request anymore */
@@ -1295,11 +1298,11 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, · 50 unmodified lines
1295	1298	goto skip;
1296	1299
1297	1300	batadv_dbg(BATADV_DBG_BLA, bat_priv,
1298		− "bla_purge_claims(): timed out.\n");
	1301	+ "%s(): timed out.\n", __func__);
1299	1302
1300	1303	purge_now:
1301	1304	batadv_dbg(BATADV_DBG_BLA, bat_priv,
1302		− "bla_purge_claims(): %pM, vid %d\n",
	1305	+ "%s(): %pM, vid %d\n", __func__,
1303	1306	claim->addr, claim->vid);
1304	1307
1305	1308	batadv_handle_unclaim(bat_priv, primary_if,
@@ -1851,8 +1854,8 @@ bool batadv_bla_rx(struct batadv_priv bat_priv, struct sk_buff skb, · 545 unmodified lines
1851	1854	*/
1852	1855
1853	1856	batadv_dbg(BATADV_DBG_BLA, bat_priv,
1854		− "bla_rx(): Unclaimed MAC %pM found. Claim it. Local: %s\n",
1855		− ethhdr->h_source,
	1857	+ "%s(): Unclaimed MAC %pM found. Claim it. Local: %s\n",
	1858	+ __func__, ethhdr->h_source,
1856	1859	batadv_is_my_client(bat_priv,
1857	1860	ethhdr->h_source, vid) ?
1858	1861	"yes" : "no");
@@ -1978,15 +1981,15 @@ bool batadv_bla_tx(struct batadv_priv bat_priv, struct sk_buff skb, · 119 unmodified lines
1978	1981	* older than 100 ms to make sure we really
1979	1982	* have a roaming client here.
1980	1983	*/
1981		− batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Roaming client %pM detected. Unclaim it.\n",
1982		− ethhdr->h_source);
	1984	+ batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Roaming client %pM detected. Unclaim it.\n",
	1985	+ __func__, ethhdr->h_source);
1983	1986	batadv_handle_unclaim(bat_priv, primary_if,
1984	1987	primary_if->net_dev->dev_addr,
1985	1988	ethhdr->h_source, vid);
1986	1989	goto allow;
1987	1990	} else {
1988		− batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Race for claim %pM detected. Drop packet.\n",
1989		− ethhdr->h_source);
	1991	+ batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Race for claim %pM detected. Drop packet.\n",
	1992	+ __func__, ethhdr->h_source);
1990	1993	goto handled;
1991	1994	}
1992	1995	}

net/batman-adv/distributed-arp-table.c+1−1

@@ -601,7 +601,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, · 600 unmodified lines
601	601	BATADV_DAT_ADDR_MAX);
602	602
603	603	batadv_dbg(BATADV_DBG_DAT, bat_priv,
604		− "dat_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst,
	604	+ "%s(): IP=%pI4 hash(IP)=%u\n", __func__, &ip_dst,
605	605	ip_key);
606	606
607	607	for (select = 0; select < BATADV_DAT_CANDIDATES_NUM; select++)

net/batman-adv/main.h+2−2

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	#define BATADV_DRIVER_DEVICE "batman-adv"
25	25
26	26	#ifndef BATADV_SOURCE_VERSION
27		−#define BATADV_SOURCE_VERSION "2017.1"
	27	+#define BATADV_SOURCE_VERSION "2017.2"
28	28	#endif
29	29
30	30	/* B.A.T.M.A.N. parameters */
@@ -168,7 +168,7 @@ enum batadv_uev_type { · 137 unmodified lines
168	168	/* Maximum number of fragments for one packet */
169	169	#define BATADV_FRAG_MAX_FRAGMENTS 16
170	170	/* Maxumim size of each fragment */
171		−#define BATADV_FRAG_MAX_FRAG_SIZE 1400
	171	+#define BATADV_FRAG_MAX_FRAG_SIZE 1280
172	172	/* Time to keep fragments while waiting for rest of the fragments */
173	173	#define BATADV_FRAG_TIMEOUT 10000
174	174

net/batman-adv/network-coding.c+1−3

@@ -1935,9 +1935,7 @@ int batadv_nc_nodes_seq_print_text(struct seq_file seq, void offset) · 1934 unmodified lines
1935	1935	list)
1936	1936	seq_printf(seq, "%pM ",
1937	1937	nc_node->addr);
1938		− seq_puts(seq, "\n");
1939		−
1940		− seq_puts(seq, " Outgoing: ");
	1938	+ seq_puts(seq, "\n Outgoing: ");
1941	1939	/* For out_nc_node to this orig_node */
1942	1940	list_for_each_entry_rcu(nc_node,
1943	1941	&orig_node->out_coding_list,

net/batman-adv/routing.c+2−2

@@ -985,8 +985,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, · 984 unmodified lines
985	985	batadv_orig_node_put(orig_node_gw);
986	986	if (is_gw) {
987	987	batadv_dbg(BATADV_DBG_BLA, bat_priv,
988		− "recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n",
989		− orig_addr_gw);
	988	+ "%s(): Dropped unicast pkt received from another backbone gw %pM.\n",
	989	+ __func__, orig_addr_gw);
990	990	return NET_RX_DROP;
991	991	}
992	992	}

net/batman-adv/send.c+3−3

@@ -971,11 +971,11 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, · 970 unmodified lines
971	971
972	972	if (hard_iface)
973	973	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
974		− "purge_outstanding_packets(): %s\n",
975		− hard_iface->net_dev->name);
	974	+ "%s(): %s\n",
	975	+ __func__, hard_iface->net_dev->name);
976	976	else
977	977	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
978		− "purge_outstanding_packets()\n");
	978	+ "%s()\n", __func__);
979	979
980	980	/* claim bcast list for free() */
981	981	spin_lock_bh(&bat_priv->forw_bcast_list_lock);

net/batman-adv/tp_meter.c+2−1

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27	#include <linux/etherdevice.h>
28	28	#include <linux/fs.h>
29	29	#include <linux/if_ether.h>
	30	+#include <linux/init.h>
30	31	#include <linux/jiffies.h>
31	32	#include <linux/kernel.h>
32	33	#include <linux/kref.h>
@@ -1497,7 +1498,7 @@ void batadv_tp_meter_recv(struct batadv_priv bat_priv, struct sk_buff skb) · 1464 unmodified lines
1497	1498	/**
1498	1499	* batadv_tp_meter_init - initialize global tp_meter structures
1499	1500	*/
1500		−void batadv_tp_meter_init(void)
	1501	+void __init batadv_tp_meter_init(void)
1501	1502	{
1502	1503	get_random_bytes(batadv_tp_prerandom, sizeof(batadv_tp_prerandom));
1503	1504	}

net/batman-adv/translation-table.c+11−10

@@ -2488,18 +2488,16 @@ static bool · 2487 unmodified lines
2488	2488	_batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,
2489	2489	struct batadv_tt_global_entry *tt_global_entry)
2490	2490	{
2491		− bool ret = false;
2492		−
2493	2491	if (tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI &&
2494	2492	tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI)
2495		− ret = true;
	2493	+ return true;
2496	2494
2497	2495	/* check if the two clients are marked as isolated */
2498	2496	if (tt_local_entry->common.flags & BATADV_TT_CLIENT_ISOLA &&
2499	2497	tt_global_entry->common.flags & BATADV_TT_CLIENT_ISOLA)
2500		− ret = true;
	2498	+ return true;
2501	2499
2502		− return ret;
	2500	+ return false;
2503	2501	}
2504	2502
2505	2503	/**
@@ -4010,19 +4008,22 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, · 1504 unmodified lines
4010	4008	const unsigned char *addr,
4011	4009	unsigned short vid)
4012	4010	{
4013		− bool ret = false;
	4011	+ /* ignore loop detect macs, they are not supposed to be in the tt local
	4012	+ * data as well.
	4013	+ */
	4014	+ if (batadv_bla_is_loopdetect_mac(addr))
	4015	+ return false;
4014	4016
4015	4017	if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
4016	4018	BATADV_TT_CLIENT_TEMP,
4017	4019	atomic_read(&orig_node->last_ttvn)))
4018		− goto out;
	4020	+ return false;
4019	4021
4020	4022	batadv_dbg(BATADV_DBG_TT, bat_priv,
4021	4023	"Added temporary global client (addr: %pM, vid: %d, orig: %pM)\n",
4022	4024	addr, batadv_print_vid(vid), orig_node->orig);
4023		− ret = true;
4024		−out:
4025		− return ret;
	4025	+
	4026	+ return true;
4026	4027	}
4027	4028
4028	4029	/**