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

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

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



Simon Wunderlich says:

====================
Here are two batman-adv bugfix patches:

 - Revert a splat on disabling interface which created another problem,
   by Sven Eckelmann

 - Fix error handling when the primary interface disappears during a
   throughput meter test, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 178c7ae9 e13258f3

net/batman-adv/hard-interface.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, 
			batadv_softif_destroy_sysfs(hard_iface->soft_iface);

			batadv_softif_destroy_sysfs(hard_iface->soft_iface);

	}

	}





	hard_iface->soft_iface = NULL;

	batadv_hardif_put(hard_iface);

	batadv_hardif_put(hard_iface);





out:

out:

net/batman-adv/tp_meter.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg) 
	primary_if = batadv_primary_if_get_selected(bat_priv);

	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (unlikely(!primary_if)) {

	if (unlikely(!primary_if)) {

		err = BATADV_TP_REASON_DST_UNREACHABLE;

		err = BATADV_TP_REASON_DST_UNREACHABLE;

		tp_vars->reason = err;

		goto out;

		goto out;

	}

	}