Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit 974dfa5e21e4f2b6540b44485e2f386751c7806f Merge: d781a70 c98c3e5 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Aug 7 19:18:14 2013 +0800

Merge branch 'maint' into next

Conflicts: unicast.c

974dfa5e21e4f2b6540b44485e2f386751c7806f bridge_loop_avoidance.c | 2 ++ gateway_client.c | 13 ++++++++++++- gateway_client.h | 3 +-- soft-interface.c | 9 ++++++++- unicast.c | 15 ++++++++++++--- 5 files changed, 35 insertions(+), 7 deletions(-)

diff --cc unicast.c index 4c5a1aa,688a041..857e1b8 --- a/unicast.c +++ b/unicast.c @@@ -428,13 -432,13 +432,17 @@@ find_router

switch (packet_type) { case BATADV_UNICAST: - batadv_unicast_prepare_skb(skb, orig_node); + if (!batadv_unicast_prepare_skb(skb, orig_node)) + goto out; ++ + header_len = sizeof(struct batadv_unicast_packet); break; case BATADV_UNICAST_4ADDR: - batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node, - packet_subtype); + if (!batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node, + packet_subtype)) + goto out; ++ + header_len = sizeof(struct batadv_unicast_4addr_packet); break; default: /* this function supports UNICAST and UNICAST_4ADDR only. It