diff --git a/[refs] b/[refs] index d0ca566e29e9..38c14e22d688 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ef04f4752a9687a03b16d4d908cf07ff8b96a3b +refs/heads/master: 69497c17c6ffc636e463d528c2f4c87e4d894964 diff --git a/trunk/net/batman-adv/routing.c b/trunk/net/batman-adv/routing.c index ef24a7205f65..773e606f9702 100644 --- a/trunk/net/batman-adv/routing.c +++ b/trunk/net/batman-adv/routing.c @@ -627,8 +627,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) /* Ensure we have all the claimed data */ if (unlikely(skb_headlen(skb) < - sizeof(struct tt_query_packet) + - tt_len)) + sizeof(struct tt_query_packet) + tt_len)) goto out; handle_tt_response(bat_priv, tt_query);