diff --git a/[refs] b/[refs]
index 5cd175387005..fbc0c0002fe7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 284fefd59ae0357695b17b59cb44d7cc12445bb5
+refs/heads/master: d2b6cc8e460494251442a877fcbc150faa175b4f
diff --git a/trunk/net/batman-adv/routing.c b/trunk/net/batman-adv/routing.c
index 840e2c64a301..015471d801b4 100644
--- a/trunk/net/batman-adv/routing.c
+++ b/trunk/net/batman-adv/routing.c
@@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
 			 * changes */
 			if (skb_linearize(skb) < 0)
 				goto out;
+			/* skb_linearize() possibly changed skb->data */
+			tt_query = (struct tt_query_packet *)skb->data;
 
 			tt_len = tt_query->tt_data * sizeof(struct tt_change);