Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info

Browse Source 
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>
This commit is contained in:
Jiri Pirko 2014-01-23 19:19:21 +01:00 committed by David S. Miller
parent 9fac865db0
commit 813f020c5d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/rtnetlink.c
View 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;
}