rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
authorJiri Pirko <jiri@resnulli.us>
Thu, 23 Jan 2014 18:19:21 +0000 (19:19 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jan 2014 00:21:48 +0000 (16:21 -0800)
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>
net/core/rtnetlink.c

index db6a239e0bcc1136e9cdd52333e3e99038a5a427..393b1bc9a618e5dee70105614772ad692e09bb7e 100644 (file)
@@ -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;
 }