summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCong Wang <cwang@twopensource.com>2014-05-22 22:57:17 +0400
committerDavid S. Miller <davem@davemloft.net>2014-05-23 01:23:00 +0400
commitb6ed5498601df40489606dbc14a9c7011c16630b (patch)
treeaa2efd7246b747db2c0fd430450a8de82c4bff50
parentfbdc0ad095c0a299e9abf5d8ac8f58374951149a (diff)
downloadlinux-b6ed5498601df40489606dbc14a9c7011c16630b.tar.xz
batman: fix a bogus warning from batadv_is_on_batman_iface()
batman tries to search dev->iflink to check if it's a batman interface, but ->iflink could be 0, which is not a valid ifindex. It should just avoid iflink == 0 case. Reported-by: Jet Chen <jet.chen@intel.com> Tested-by: Jet Chen <jet.chen@intel.com> Cc: David S. Miller <davem@davemloft.net> Cc: Steffen Klassert <steffen.klassert@secunet.com> Cc: Antonio Quartulli <antonio@open-mesh.com> Cc: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Cong Wang <cwang@twopensource.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/batman-adv/hard-interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index b851cc580853..fbda6b54baff 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -83,7 +83,7 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
return true;
/* no more parents..stop recursion */
- if (net_dev->iflink == net_dev->ifindex)
+ if (net_dev->iflink == 0 || net_dev->iflink == net_dev->ifindex)
return false;
/* recurse over the parent device */