Commit 6a4bc44b authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation 



The neighbor compare API implementation for B.A.T.M.A.N. V checks whether
the neigh_ifinfo for this neighbor on a specific interface exists. A
warning is printed when it isn't found.

But it is not called inside a lock which would prevent that this
information is lost right before batadv_neigh_ifinfo_get. It must therefore
be expected that batadv_v_neigh_(cmp|is_sob) might not be able to get the
requested neigh_ifinfo.

A WARN_ON for such a situation seems not to be appropriate because this
will only flood the kernel logs. The warnings must therefore be removed.

Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@openmesh.com>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent bad5680b

net/batman-adv/bat_v.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "main.h"

#include "main.h"





#include <linux/atomic.h>

#include <linux/atomic.h>

#include <linux/bug.h>

#include <linux/cache.h>

#include <linux/cache.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/if_ether.h>

#include <linux/if_ether.h>
@@ -623,11 +622,11 @@ static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1, 
	int ret = 0;

	int ret = 0;





	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);

	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);

	if (WARN_ON(!ifinfo1))

	if (!ifinfo1)

		goto err_ifinfo1;

		goto err_ifinfo1;





	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);

	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);

	if (WARN_ON(!ifinfo2))

	if (!ifinfo2)

		goto err_ifinfo2;

		goto err_ifinfo2;





	ret = ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;

	ret = ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput;
@@ -649,11 +648,11 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, 
	bool ret = false;

	bool ret = false;





	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);

	ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);

	if (WARN_ON(!ifinfo1))

	if (!ifinfo1)

		goto err_ifinfo1;

		goto err_ifinfo1;





	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);

	ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2);

	if (WARN_ON(!ifinfo2))

	if (!ifinfo2)

		goto err_ifinfo2;

		goto err_ifinfo2;





	threshold = ifinfo1->bat_v.throughput / 4;

	threshold = ifinfo1->bat_v.throughput / 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE