The following commit has been merged in the master branch: commit 33faa04547d7ab51700bdc3fe9b6306d93dea43f Author: Antonio Quartulli antonio@meshcoding.com Date: Sat Oct 19 14:06:05 2013 +0200

batman-adv: check skb preparation return value

Fix bogus merge conflict resolution by checking the return values of the skb preparation routines.

Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 82588e4..d765d53 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -267,11 +267,14 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,

switch (packet_type) { case BATADV_UNICAST: - batadv_send_skb_prepare_unicast(skb, orig_node); + if (!batadv_send_skb_prepare_unicast(skb, orig_node)) + goto out; break; case BATADV_UNICAST_4ADDR: - batadv_send_skb_prepare_unicast_4addr(bat_priv, skb, orig_node, - packet_subtype); + if (!batadv_send_skb_prepare_unicast_4addr(bat_priv, skb, + orig_node, + packet_subtype)) + goto out; break; default: /* this function supports UNICAST and UNICAST_4ADDR only. It