|
@@ -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;
|