[linux-next] LinuxNextTracking branch, master, updated. next-20140219

batman at open-mesh.org batman at open-mesh.org
Thu Feb 20 00:22:55 CET 2014

The following commit has been merged in the master branch:
commit e889241f45f9cecbc84a6ffed577083ab52e62ee
Author: Antonio Quartulli <antonio at meshcoding.com>
Date:   Mon Jan 27 12:23:28 2014 +0100

    batman-adv: fix TT-TVLV parsing on OGM reception
    When accessing a TT-TVLV container in the OGM RX path
    the variable pointing to the list of changes to apply is
    altered by mistake.
    This makes the TT component read data at the wrong position
    in the OGM packet buffer.
    Fix it by removing the bogus pointer alteration.
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index b6071f6..beba13f 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3218,7 +3218,6 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv,
-		tt_change = (struct batadv_tvlv_tt_change *)tt_buff;
 		batadv_tt_update_changes(bat_priv, orig_node, tt_num_changes,
 					 ttvn, tt_change);


More information about the linux-merge mailing list