Commit 813f020c authored Jan 23, 2014 by Jiri Pirko Committed by David S. Miller Jan 23, 2014

rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info



This check is not needed because the same check is done before
fill_slave_info is used in rtnl_link_slave_info_fill.
Also, by removing this check, kernel will fillup IFLA_INFO_SLAVE_KIND
even for slaves of masters which does not implement fill_slave_info.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9fac865d

net/core/rtnetlink.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -482,8 +482,7 @@ static bool rtnl_have_link_slave_info(const struct net_device *dev)
		struct net_device *master_dev;

		master_dev = netdev_master_upper_dev_get((struct net_device *) dev);
		if (master_dev && master_dev->rtnl_link_ops &&
		master_dev->rtnl_link_ops->fill_slave_info)
		if (master_dev && master_dev->rtnl_link_ops)
		return true;
		return false;
		}