Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc666c53 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge 

Included change:
- Check if the skb has been correctly prepared before going on
parents 8f9d5138 50fa3b31

net/batman-adv/unicast.c

+7 −3
Original line number Diff line number Diff line
@@ -432,12 +432,16 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv, 


	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: