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

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

Merge tag 'batadv-net-for-davem-20180326' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
Here are some batman-adv bugfixes:

 - fix multicast-via-unicast transmissions for AP isolation and gateway
   extension, by Linus Luessing (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3c82b372 a752c0a4

net/batman-adv/gateway_client.c

+4 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 
{

	struct batadv_neigh_node *neigh_curr = NULL;

	struct batadv_neigh_node *neigh_old = NULL;

	struct batadv_orig_node *orig_dst_node;

	struct batadv_orig_node *orig_dst_node = NULL;

	struct batadv_gw_node *gw_node = NULL;

	struct batadv_gw_node *curr_gw = NULL;

	struct batadv_neigh_ifinfo *curr_ifinfo, *old_ifinfo;
@@ -757,6 +757,9 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 


	vid = batadv_get_vid(skb, 0);



	if (is_multicast_ether_addr(ethhdr->h_dest))

		goto out;



	orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source,

						 ethhdr->h_dest, vid);

	if (!orig_dst_node)

net/batman-adv/multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -814,8 +814,8 @@ static struct batadv_orig_node * 
batadv_mcast_forw_tt_node_get(struct batadv_priv *bat_priv,

			      struct ethhdr *ethhdr)

{

	return batadv_transtable_search(bat_priv, ethhdr->h_source,

					ethhdr->h_dest, BATADV_NO_FLAGS);

	return batadv_transtable_search(bat_priv, NULL, ethhdr->h_dest,

					BATADV_NO_FLAGS);

}



/**