From: Jiri Pirko Date: Thu, 23 Jan 2014 18:19:21 +0000 (+0100) Subject: rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=813f020c5d16878486b9a103bd59831846652247;p=linux-beck.git 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 Signed-off-by: David S. Miller --- diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index db6a239e0bcc..393b1bc9a618 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -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; }