diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-01 19:19:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-01 19:19:26 +0100 |
| commit | 34dbba5d2dafc8ec0f9d70a0d9ac5c4504f27ccd (patch) | |
| tree | b9ff3d6ba07428524f50eb4519d570119fd8fc98 /net/batman-adv/hard-interface.c | |
| parent | Merge tag 'mac80211-for-davem-2019-02-01' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | batman-adv: release station info tidstats (diff) | |
| download | linux-34dbba5d2dafc8ec0f9d70a0d9ac5c4504f27ccd.tar.xz linux-34dbba5d2dafc8ec0f9d70a0d9ac5c4504f27ccd.zip | |
Merge tag 'batadv-net-for-davem-20190201' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are some batman-adv bugfixes:
- Avoid WARN to report incorrect configuration, by Sven Eckelmann
- Fix mac header position setting, by Sven Eckelmann
- Fix releasing station statistics, by Felix Fietkau
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/hard-interface.c')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 508f4416dfc9..415d494cbe22 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -20,7 +20,6 @@ #include "main.h" #include <linux/atomic.h> -#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/gfp.h> @@ -179,8 +178,10 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) parent_dev = __dev_get_by_index((struct net *)parent_net, dev_get_iflink(net_dev)); /* if we got a NULL parent_dev there is something broken.. */ - if (WARN(!parent_dev, "Cannot find parent device")) + if (!parent_dev) { + pr_err("Cannot find parent device\n"); return false; + } if (batadv_mutual_parents(net_dev, net, parent_dev, parent_net)) return false; |