From 11c6eae7a4e664c690e0310122e683b1c9f08d3c Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Fri, 2 Dec 2011 17:38:52 +0100 Subject: [PATCH] --- yaml --- r: 278755 b: refs/heads/master c: 69497c17c6ffc636e463d528c2f4c87e4d894964 h: refs/heads/master i: 278753: 00e9afcdcc9774b77bc4d6d0336316ba3d66412e 278751: eb7549b8169bf094af0b45da78841f250312f2df v: v3 --- [refs] | 2 +- trunk/net/batman-adv/routing.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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);