Merge tag 'batadv-net-for-davem-20161202' of git://git.open-mesh.org/linux-merge (a38b6100) · Commits · 戴 / test

Simon Wunderlich says: ==================== Here is another batman-adv bugfix: - fix checking for failed allocation of TVLV blocks in TT local data, by Sven Eckelmann ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/batman-adv/translation-table.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
		&tvlv_tt_data,
		&tt_change,
		&tt_len);
		if (!tt_len)
		if (!tt_len \|\| !tvlv_len)
		goto unlock;

		/* Copy the last orig_node's OGM buffer */
		@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
		&tvlv_tt_data,
		&tt_change,
		&tt_len);
		if (!tt_len)
		if (!tt_len \|\| !tvlv_len)
		goto out;

		/* fill the rest of the tvlv with the real TT entries */

Admin message